only pep8 fixes, no more behaviour changes