More comments and factoring