Refactoring of log messages