Removed instances of message in value field

For consistency and use of fields I have removed any instances where I
had a message appearing in the value field. Added these messages to a
message field.