change as per code review

change as per code review