Cleaned up quick_run a bit.