pep8 refactors