NOREF: Cleaning up a little more code and changing the keyfile in puppetparams to a private key
NOREF: Cleaning up a little more code and changing the keyfile in puppetparams to a private key