Sample genotype refactor