Sonar Cleanup

Minor cleanup efforts per sonar.