CL-45 : refactoring logger