Cloud class refactoring