Commenting and code cleanup.