[BUILD] Randomizer rework

Minor cleanup