Refactor GameRepository