Code refactoring : individual search