pep8 fixes

pep8 fixes for the rest of the code