more cleanup, fixing comments