More PEP8 cleanups