pep8 and refactored