Refactoring for PEP 8 style