Improve messages formatting