Clean code
Add simple configuration on EvaluatorHolder