Changes to Observable classes & cleaning.