Minor cosmetic edits, nothing much noteworthy.

I did comment out some of @wei2912's work, because I plan on redoing/editing it
later.