Initial refactoring of `DataList` methods (in progress)