DDF-512  code cleanup per Sonar and code review comments