CLC-4140, code style fixes per PR comments