Little clean up, changed configuration of the plugin