Addressing PR comments