Move vars to top of scope