[BUGFIX] Variable declaration ordering