Cleaner next state computation + scoreboard columns