Score refactoring