re-format messaging classes