revisiting the plugin. starting out with cleaning up a bit