Cleaned up the message a bit