More comments, a little cleanup