manual PEP8 fixes