Reorder and clean up.