dict comprehensions removed for py2.6 compatibility