Record-tree: done. refactor 2