Refactor radial tree