PEP8 fixes, pass 1