WSSQL-38 Changes from code review.

Signed-off-by: rpastrana <rodrigo.pastrana@lexisnexis.com>