Refactor cloud varyings