Refactored scoring