CL-49 : refactoring