remove 18 sonar issues