EquippedItems + Refactoring