Renamed broker to queue
Tweaked simple queue functionality; Some other minor refactoring