refactor polish to pre iterator name