pep8 and refacto