Refactored the death action.