Cleanup of include/dai/factor.h