rework env vars