Updates per the code review