Refactor dl-list