Refactor transition to timing and move default values