Refactor scores, more structured now.