Refactor to tuning the evaluator performance