Score refactor