Puppet Lint/Style fixes

No functionality change, just code update for Puppet lint & style guide fixes.