Some style edits