Merge "refactor list operation"