formatting
put all iterators in the same module
cleanup and format tests
regenerate output