Move vars to sub scope