pep8 fixes; fixed a regression
fixing more pep8 errors