reorder, cleanup