code cleanup
update message wrapper format