ListEdit refactoring