Pep8 refacto