Further style edits