Updates per code review