Refactored items