Better use of constants in parser
Mini tidying up