Update grammar and formatting