More PEP 8 fixes