Finished tidying up EBNF section