Re-order and tidy