Commit before refactor