Update grammar and code fmt