More comments, a little factorization.