Get rid of the parser class
Minor fixes