pep8 fixes
pep8 tests etc