triage service refactor