Re-order code for consistency

No functional change