Active search, refactoring