Updated grammar to use keyword predicate
Cleanup