More refactoring...creating class for search result