1. search: Refactoring