Refactor cloud yet and again