Fix small errors after codereview
Change message structure to command and reply

The represents the protocol better and removes a bit of typing overhead
for MessageField