Refactor broker into publisher and subscriber

That most probably have to be before _close obviously. Wonder why it does something meaningful then.