Reordering and cleaning up.