Address review comments:

- check for different env. vars.
- fix logging message