Puppet-Lint Updates

Ran Puppet-Lint to cleanup code.