Refactor of Scoreboard