Cleaned up how the step transitions worked.