cleanup an a few comments