Consistentcy in iteration blocks and remove unnecessary code

Just making some things consistent across files. Also removing some unnecessary code.
This is actually much slower afaik. cc @stefanpenner