Put things in a more logical order.