Adding comment in the parser, and little code cleaning