Added new iterator implementation (minor cosmetic changes)