Refactoring of logs