Minor style changes
Ensure variables can be defined in comprehensions