[refactor] transition tweaks