Improve messages in console