Changes to comply with puppet-lint