misc refactor in iterators