refs #18 Message format cleanup