Pep8 changes (with a stray .keys() removed)