General Tidyup and Tree Pruned

General Tidyup and Tree Pruned