cleaning up the tree a bit more