Refactor item dropping