Unify environment variables usage across the project (#423)

Unify environment variables usage across the project (#423) #562