finish refactoring all Sort() into OrderBy()