Refactored evaluation