Pep-8 refactoring.