Re-factoring of BTree