Refactoring of transition and state constructor parameters