Improve logging format