Comments, deleted blank lines, other minor edits.