Apply wording approvements as of Jonathan's suggestion