Remove TreeEvaluator class - using function style instead