Minor refactoring for PEP8 compliance.