(QENG-969) Addresss PR feedback.

Signed-off-by: Wayne <wayne@puppetlabs.com>