Reduced to 2 list comprehensions