PIVOT-1032: Fix the "HideUtilityClassConstructor" as much as useful, and fix other style errors in these files also.