WSSQL-38 Further changes from code review.

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