maybe commit before refactoring
save