format source
move iterator methods to class Iterators
dao.sql refactor