cosmetic change

fix and improve comments and foldings