more PEP-8 fixes