Adding dataset generation from clusters
Refactoring for shorter code