PEP8 fixes

More PEP8 fixes.