Further Sorting

Just some housecleaning