Refactoring scoreboard