Change dictionaries to follow PEP 8