Extracted OrderBy to aseparate class