Slight refactor that results in a 25% performance boost for Cat I export