Refactor evaluateScores