Cleaning up code so the plugin works better out of the box!