Refactor 1-2 brother trees (no delete yet)