Some cleaning and the parser