Fix #36: Refactoring of log messages