queue to Queue and minor cleanup