Clean-up and rearrange.