More comments, cleanup