diff --git a/gst/effectv/gstshagadelic.c b/gst/effectv/gstshagadelic.c
index 176990e..685cd9c 100644
--- a/gst/effectv/gstshagadelic.c
+++ b/gst/effectv/gstshagadelic.c
@@ -26,12 +26,13 @@
 #include "config.h"
 #endif
 
-#include <gst/video/gstvideofilter.h>
-
 #include <math.h>
 #include <string.h>
 
+#include <gst/gst.h>
+
 #include <gst/video/video.h>
+#include <gst/video/gstvideofilter.h>
 
 #ifndef M_PI
 #define M_PI  3.14159265358979323846
@@ -71,16 +72,11 @@
   GstVideoFilterClass parent_class;
 };
 
-GType gst_shagadelictv_get_type (void);
+GST_BOILERPLATE (GstShagadelicTV, gst_shagadelictv, GstVideoFilter,
+    GST_TYPE_VIDEO_FILTER);
 
 static void gst_shagadelic_initialize (GstShagadelicTV * filter);
 
-static const GstElementDetails shagadelictv_details =
-GST_ELEMENT_DETAILS ("ShagadelicTV",
-    "Filter/Effect/Video",
-    "Oh behave, ShagedelicTV makes images shagadelic!",
-    "Wim Taymans <wim.taymans@chello.be>");
-
 static GstStaticPadTemplate gst_shagadelictv_src_template =
 GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
@@ -95,8 +91,6 @@
     GST_STATIC_CAPS (GST_VIDEO_CAPS_BGRx)
     );
 
-static GstVideoFilterClass *parent_class = NULL;
-
 static gboolean
 gst_shagadelictv_set_caps (GstBaseTransform * btrans, GstCaps * incaps,
     GstCaps * outcaps)
@@ -128,13 +122,11 @@
 gst_shagadelictv_get_unit_size (GstBaseTransform * btrans, GstCaps * caps,
     guint * size)
 {
-  GstShagadelicTV *filter;
+  GstShagadelicTV *filter = GST_SHAGADELICTV (btrans);
   GstStructure *structure;
   gboolean ret = FALSE;
   gint width, height;
 
-  filter = GST_SHAGADELICTV (btrans);
-
   structure = gst_caps_get_structure (caps, 0);
 
   if (gst_structure_get_int (structure, "width", &width) &&
@@ -148,10 +140,10 @@
   return ret;
 }
 
-static unsigned int
+static inline guint
 fastrand (void)
 {
-  static unsigned int fastrand_val;
+  static guint fastrand_val;
 
   return (fastrand_val = fastrand_val * 1103515245 + 12345);
 }
@@ -218,7 +210,7 @@
 gst_shagadelictv_transform (GstBaseTransform * trans, GstBuffer * in,
     GstBuffer * out)
 {
-  GstShagadelicTV *filter;
+  GstShagadelicTV *filter = GST_SHAGADELICTV (trans);
   guint32 *src, *dest;
   gint x, y;
   guint32 v;
@@ -226,10 +218,6 @@
   gint width, height;
   GstFlowReturn ret = GST_FLOW_OK;
 
-  filter = GST_SHAGADELICTV (trans);
-
-  gst_buffer_copy_metadata (out, in, GST_BUFFER_COPY_TIMESTAMPS);
-
   src = (guint32 *) GST_BUFFER_DATA (in);
   dest = (guint32 *) GST_BUFFER_DATA (out);
 
@@ -272,11 +260,30 @@
 }
 
 static void
+gst_shagadelictv_finalize (GObject * object)
+{
+  GstShagadelicTV *filter = GST_SHAGADELICTV (object);
+
+  if (filter->ripple)
+    g_free (filter->ripple);
+  filter->ripple = NULL;
+
+  if (filter->spiral)
+    g_free (filter->spiral);
+  filter->spiral = NULL;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
 gst_shagadelictv_base_init (gpointer g_class)
 {
   GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
 
-  gst_element_class_set_details (element_class, &shagadelictv_details);
+  gst_element_class_set_details_simple (element_class, "ShagadelicTV",
+      "Filter/Effect/Video",
+      "Oh behave, ShagedelicTV makes images shagadelic!",
+      "Wim Taymans <wim.taymans@chello.be>");
 
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&gst_shagadelictv_sink_template));
@@ -285,13 +292,12 @@
 }
 
 static void
-gst_shagadelictv_class_init (gpointer klass, gpointer class_data)
+gst_shagadelictv_class_init (GstShagadelicTVClass * klass)
 {
-  GstBaseTransformClass *trans_class;
+  GObjectClass *gobject_class = (GObjectClass *) klass;
+  GstBaseTransformClass *trans_class = (GstBaseTransformClass *) klass;
 
-  trans_class = (GstBaseTransformClass *) klass;
-
-  parent_class = g_type_class_peek_parent (klass);
+  gobject_class->finalize = gst_shagadelictv_finalize;
 
   trans_class->set_caps = GST_DEBUG_FUNCPTR (gst_shagadelictv_set_caps);
   trans_class->get_unit_size =
@@ -300,35 +306,8 @@
 }
 
 static void
-gst_shagadelictv_init (GTypeInstance * instance, gpointer g_class)
+gst_shagadelictv_init (GstShagadelicTV * filter, GstShagadelicTVClass * klass)
 {
-  GstShagadelicTV *filter = GST_SHAGADELICTV (instance);
-
   filter->ripple = NULL;
   filter->spiral = NULL;
 }
-
-GType
-gst_shagadelictv_get_type (void)
-{
-  static GType shagadelictv_type = 0;
-
-  if (!shagadelictv_type) {
-    static const GTypeInfo shagadelictv_info = {
-      sizeof (GstShagadelicTVClass),
-      gst_shagadelictv_base_init,
-      NULL,
-      (GClassInitFunc) gst_shagadelictv_class_init,
-      NULL,
-      NULL,
-      sizeof (GstShagadelicTV),
-      0,
-      (GInstanceInitFunc) gst_shagadelictv_init,
-    };
-
-    shagadelictv_type =
-        g_type_register_static (GST_TYPE_VIDEO_FILTER, "GstShagadelicTV",
-        &shagadelictv_info, 0);
-  }
-  return shagadelictv_type;
-}