scoreboard refactor