PEP8, refactoring