Refactor item