adding scoreboard code clean-up