Improve messages to user