Clean up iteration a bit more