Adds changes suggested during review

Signed-off-by: Dinesh Shetye <dinesh.shetye@lexisnexis.com>