One more PEP-8 refactor