A few cleanup methods, and changing genotype definitions