Additional PEP8 cleanups