Fix sonar code bug and smell issue