Minor tweaks to the routine, improved a transition