Don't remove run if we get a stop
Use consistent string quoting