updated some sonar issues