Consolidate env access

Mikhail Mazurskiy requested to merge ash2k/move-env-var into master Jul 29, 2022