Refactored scorer