Improve a bit 'factorial' related changes