Re-order code for static declarations