Change folds format, cleanup