removed references to goto
more refactoring for GameStage