Refactoring to align with CheckStyle: Google requirements and general IDE problem fixes

Merge request reports

Loading