Intelligent search. Refactoring. Phase II