More minor stylistic edits