Refactor item set transition functions