Removed dict comprehensions