Simplify sorting and initial effort towards unused space sort