Refactoring, search in my league