Cleanup
Make map'ing itertext slightly cleaner
Be clever and slightly hacky with iterators