Queue/QueueGroup cleanup and code improvements

* Make QueueGroup enumerable
* eschew if/then where possible
Code beautyfication