Improve the logs