misc PEP8 fixes