Further tidying up. Just Lexical section to finish
Finished refactoring EBNF