This is much better. Get rid of the superfluous numbering and put in the comments there.