Simplfying parser
simplifying parser