refactoring CLManager ok