Re-order code