More comments did some cleanup