cleaned up the runner code.