Some more changes to the comments only. I would never comment this much in real life, assuming that the reader doesn't need a lot of detail.