Refactoring (PEP8)