Some more PEP8 fixes