clean up flow for stepping through code