Refactors iterators