Commit statement refactoring