cleaned up code for WHO evaluator