more PEP8 fixes