refactor to make env variables configurable part I