Misc PEP8 fixes