Refactor extraInfoExtractor