Reformat. A few minor edits.