Moving variables from constants to environment variables