Minor edits
Merge remote-tracking branch 'origin/coderevision' into coderevision