Much cleaning up of samplers.py