Final(?) PEP8 cleanups