Reorder flag vars