Clean up some code and comments related to iterations (#122)