Cleanup some of the message strings