change ENV calls to use ENV.fetch