Abstract: A baffle having a body portion that includes at least one side wall. The side wall geometry is adapted to register with a mating surface of a tube. A heat exchanger assembly including a baffle, and a tool for forming a slot in a heat exchanger for accepting a baffle is also disclosed.