simplify the messages
Merge pull request #282 from bstell/master

simplify the messages