style fixes to satisfy puppet-lint

please see inline comments