Improve formatting of messages.