Fixed SonarQube code smells.

1 job for fix-sonar in 20 minutes and 14 seconds (queued for 1 second)