Tidy up and switch to FastRandom