Updates as per code review