refactoring Items
some changes