Change as per code review

Change as per code review