moved env variables to env