Changed comprehensions to use the dict constructor