Refactor Broadcast - initializer method

This in turns allows to clean up the broadcast method in client.rb