pep8 fixes

Another set of pep8 fixes
Yeah, this is explicitly documented there. Why do pep 8 fixes keep trying to break this code???