Refactor/phenotype