Touched up comments a bit