John, Sumit | Diagnosis validation WIP
John, Sumit | minor refactorings to clean up code