Even more PEP8 fixes