refactoring items