A little cleanup plus adding a "Randomize" feature for pairing.