refactor(iterator) - move to Util API