Refactoring NumberBroadcaster