refactor Evaluator/Container