Commit before refactoring