some Logging refactor