Minor refactoring for startup events. Install & uninstall events