Refactoring to PEP8 before starting work.