refactor some things in GameState struct