Minor adjustments
* Set message to (no message) if empty
* Prettify string concating
* Remove trailing whitespace