clean numbering and unused comments