Make BetterGameState package-level