Minor score tracking refactoring