removed python2.7-specific dict comprehension (see PEP 274)