changed dictionary comprehensions to be compatible with python 2.6