Cleaned up sorter methods