Be consistent in iterating over dictionary keys
Minor PEP 8 cleanup
Be consistent in using tuples across dictionary iteration