commit before major refactor