DP-127 Code review changes.