Refactor around evalBox