Refactor on EvalBox