Refactored scores definition