Minor change
More list comprehensions