Update per Lora's code review