Improve style…
simplify some code
show off iterators