Various style edits.