more PEP8 formatting fixes