INTEXT-116: Addressing PR comments