Moving the random instance to RandomUtil
Minor changes