SonarQube issues fixed.

Signed-off-by: yyenigun <yyenigun@gmail.com>