reorder clean up