Polished up client, split message.h/.c