Interator restructuring