Small refactor genotypeData and merge erwin