Code cleanup

Add iterators.