fix issue with nfactor; cleanup