PEP8 cleanups