Refactor NegativeDescriptorState