pep8 fixes

Another set of pep8 fixes
@cimarronm Can you revert this block of changes?