Cleaned up @DiscreteD rand