tidy up and use more explicit hiera lookups