Better factorization