Refactor sorter fixed masstart