Item: refactoring