Minor edits, style guide changes