Refractor of Parser

+ Edits to EDIT.