Puppet-lint cleanup