[FOLD] Return void from protocol message handlers
[FOLD] style, rename members