Fix bug on refactor pep8