refactor urgency resolution