ADD: simplify the grammar file