TEIID-247 refining grammar for readability