clean up the transitions a bit