Refactoring of the log messages