Comprehensions improvement