Addressing more code review comments