Improve while loop
Single state game flow