Remove dead code
Extract search logic to separate class
Unify namespace