Pep8 refactor