Finished cleanup, added the Sampler interface