Clean up install_cartridges a bit more