better randomizer
clean code