Refactor identify extractor