Cleaned up the scoreboard interface a bit.