Let n_fold be configurable
Reduce duplication
New accessors
Refactor