CA-90846: Addressed review comments

Signed-off-by: Chandrika Srinivasan <chandrika.srinivasan@citrix.com>