pep8 fixes

Another set of pep8 fixes