reorganize environment variables