PEP8 Refactoring