Cleaning up the node hierarchy
Little more clean up