Update readme
Parser cleanup