no change, just more pep8-friendly, and use dict comprehension