Reorder variable declarations