PEP8 and code cleanup.