Cleaning up the grammar