Replaced ::iterator stuff with auto
Removed obsolete comment