EBNF looking improved