Added iterator to for loop

[matthiasdebernardini]

this change removes a function and hoists some of the loop logic into the iterator