* refactoring items