code clean up
Additional tree node types