A flue baffle for a water heater comprises a plurality of holes along a length of the baffle and a plurality of bent blades along the length of the baffle, where each hole of the plurality of holes is adjacent to a bent blade of the plurality of bent blades. The holes are configured to permit flue gas to pass through the holes. The bent blades can have an alternating pattern where a first bent blade extends from one side of the baffle and the next bent blade extends from an opposite side of the baffle. A press tool for forming the baffle comprises a piercing tool for forming the plurality of holes and a lance and fold die for forming the bent blades.