removed some dict comprehensions