Move repeated comparator to ComparatorUtil collection