GH-95 Changes from code review
Signed-off-by: Rodrigo Pastrana <Rodrigo.Pastrana@lexisnexis.com>