Re-ordering variable declarations