Addressing PR comments from Harsh.