Refactor extractor and freq-methods