Style and minor edits