Code cleanup - resolve SonarQube violations

GCP-10131

Reviewer: Mae Turiana