more refactoring of scoreboard code