PEP8 and cleanup.