refactor things for >2.7
take hiera out of the params