improvments of the logging statements