Update wording with Gilbert's suggestions