fix doc blocks
clean up message - message builder relationship
break RequestMessage construction in to smaller steps