simplified Evaluator and tested
simplified Proportion in accordance with the changes I made to Evaluator, and tested