Refactoring of Searcher into transform functions (part 1)