refactor logging formats