Fix variable (initialization) order