Fix indentation & update rollback functions