manage: items refactoring