Cleaned up the message format a little