LPS-33695 Source formatting, null checks not required

LPS-33652 Source formatting