More comments, more cleanup