Refactoring for PEP8 compliance.