GH-106 Minor changes from code review.

Signed-off-by: Rodrigo Pastrana <Rodrigo.Pastrana@lexisnexis.com>