Rework environment variables