More game selector refactoring