Continue to factorize & simplify
doc