Final style edits