Refactor environment variable access
Consider environment variables when evaluating strings