refactoring, cleaning, pep-8