DDF-543 Code cleanup per review comments