Refactoring in Uninstall dialog