Reorder and clean up