NERParse Refactoring