Improve messages/formatting