Code refactoring: Added Genotype class