Simplifying the grammar

Simplifying the grammar