more PEP8 warnings fixed