Start update_compare_tree refactoring