Clean the sorter by not copy/paste code