Some more code cleanup

Add GameState Class which tracks whether the game is over and whether
the user has won