Address code review comments (2)