just refactoring the envs