finalize re-factoring of discrete sampling methods