[PEP8] Fix whitespace issues
[PEP8] More autopep8 fixes