Tidy up errors within the parser
Seperate out all the tokens for the enums
Extract the seperator tokens