improve generating cloud variables