pep8, add rollbacks