restructuring of parser
restructure parser and edited edit feature