Changes to follow official Puppet style guide

See https://docs.puppetlabs.com/guides/style_guide.html for full details, also stops Puppet-lint complaining :+1: