PEP8 whitespace fixes
More PEP8 fixes