Tidying up the parser to make the output a little bit neater.