Refactor for transitions