Refactoring
Deleted
Changed brokerName