Refactoring in Sorter and SorterConfig