Refactor venn