Minor whitespace and formatting edits