CA-135774: Address more review comments

Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>