Edited ParserEdit
Complete refactoring ParserEdit