Wording improvements as of Richard's suggestion