unified the messaging data structures, formatted code using astyle, changed the buffer sequence to be simpler