Reformatted message creation a bit.