PEP8 refactoring