refactor env variables
refactor env variables