More SonarQube suggested fixes
More SonarQube suggested fixes