puppet-lint and style fixes