Cosmetic improvements to the plugin