Added relevance to results and Refactoring