some cleaning up of the logging messages