PIM-1370 : Clean code for unique value guesser