OrderByClause refactoring