Simplify includes
Simplify search method definition