Refactoring of the gameData