Refactored the items.