Refactor item creation