various PEP8 fixes