Cleaning up the message here...