More PEP 8 coding style fixes