Starting to clean up tree class