changes as per code review