Better formatting of BNF