Commenting & cleanup.