Refactoring - PEP 8