Got rid of a few comments