Refactored dead at mating