Refactoring search logic to it’s own class Search
Refactored Search