Move vars to explicit state and add :"$_"