Sonar warning.
Sonar cleanup.
Various sonar clean ups.