fixing more Sonar issues