Renamed stuff and extracted an additional method for the tree container