better organized game state