clean up and reorder