Addressing 2 code review comments