improved messages formatting