fixed the following Sonar issues:
https://sonar.onap.org/issues/search#issues=AWBUkkkY-08if2a6vTKf
https://sonar.onap.org/issues/search#issues=AWBUklt5-08if2a6vT7e
https://sonar.onap.org/issues/search#issues=AWBUklkg-08if2a6vT4U