Code cleanups and updated to use new PluginUpdater