restructuring environment variables