pep8 fixes

Another set of pep8 fixes
the comments here should probably also go above the assignments