Small, non-functional changes around the tree