Minor wording and structure update