Refactor according to puppet-lint and Puppet Forge guidelines