reorder/cleanup