Cleaned out Sampler class