Improve install/uninstall commands