More PEP8 autofixes