Further pep8 refactoring.