tidy up for game states