made iterators single line where practical