Fix evaluator

move 2 parameter in constructor for evaluator to param