alex, andrei cleanup as sonar demanded
alex, andrei added sonar fixes
Merge branch 'sonar_fixes'