updates as per code review