Touched up comments a little