BRANCH:SP-1150: modified code as per code review suggestions