Be more pythonic. add dictionary comprehension