Refactorign search