Minor cleaning and plugin update