Partially modularized the scoreboard