partial pep8 fixes
finished pep8 fixes
tidy up