Cleaned up the plugin a bit.