PEP8 cleanups (partial)