Refactor, no functional changes
Make sure the proper broadcaster is used. This was a regression after the last refactoring
Final refactoring changes