Better use of env vars