Improved some list comprehensions