Various stylistic edits.