Refine & sort

Sort