Improve logging messages