some cleaning up - fewer print statements
Better way to create dict of queues