small refactorings and latest CDO target).
small refactorings and latest CDO target).