refactoring: logger, to be continued