some last small changes addressing Sonar violations