Good place to commit before refactoring (match)