Refactor samplers