Diagnosis Phase Refactorization