cleanup
Fixed createMessage.