Moving vars to environment