Fine tune Env setup script