More refactoring of the logger package