Some adjustments on wording