Grammar changes

Simplifying the grammar