Pep8

pep8 fixes to a number of the files