Cloud refactor