Clean up comprehensions/iterations