Refactored patient infection into geno and pheno parts