PEP8 Cleanup