Tidying up for puppet-lint