Grammar changes and reformatting