WireLogger, some refactoring