DP-127 Code review fixes. Formatting fixes