R# code cleanup to all. Consistent style with the checked-in settings.