And in general, don't destroy that sort of comment alignment.  It's far easier to read as it was.