Reorganized comment blocks.
(Miscellaneous edits/renames/etc.)