Improving the setup and cleanup of jack-in