Gwas refactorization