Clouds Refactoring