Record-tree: done. refactor