tidied up env variables