Item refactoring