HLinting and tidying up the parser
Linting and tidying up the Validate module