Improved the logging messages