A round of editing

Sample code changes to come separately.