comment cleanup
get rid of Message.Set again, use map[string]interface{} instead