Re-order columns, add type for safety