Minor edits
Reformat comments