new tree present + code cleanup