code review changes

+review CR-NS-192