Got rid of Cloud class