Support/refactor

The following refactoring takes into account the uniqueness of each of the elements of each set and the overall uniqueness of the number of draws.