Improve flow of runner.