DDF-378 - cleaned up some review comments