Logger refactoring