Small refactoring within scoreboard