[IMP] analyze: some cosmetic changes + better comments