Remove comment and factorize