Refactored Won property and game won logic order