Fixes: #2410 Cleaned code according to sonar reports