more pep8 refactoring