Commenting, renaming, and other minor refactoring.