BatchSampling - last cleanups and comments