PEP8 Refactor