Further cleaning up of runner.py