refactoring, cleaning, pep8