Unify environment variables usage across the project

Unify environment variables usage across the project #560