diff --git a/CHANGES.rst b/CHANGES.rst
index 229b4aa..0c045e1 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,7 @@ Release 1.0.0 (dev)
 -------------------
 
 **Backward incompatible changes:**
+
 - filter `embed_video_tags.embed` has been removed
 
 Backward compatible changes:
diff --git a/embed_video/backends.py b/embed_video/backends.py
index 3bfbe5b..b329136 100644
--- a/embed_video/backends.py
+++ b/embed_video/backends.py
@@ -1,15 +1,12 @@
 import re
+import sys
 import json
 import requests
 
-try:
-    # Python <= 2.7
-    import urlparse
-    from urllib import urlencode
-except ImportError:
-    # support for py3
+if sys.version_info.major == 3:
     import urllib.parse as urlparse
-    from urllib.parse import urlencode
+else:
+    import urlparse
 
 from django.http import QueryDict
 from django.template.loader import render_to_string
@@ -200,7 +197,6 @@ class VideoBackend(object):
         raise NotImplementedError
 
     def set_options(self, options):
-        print options
         for key in options:
             setattr(self, key, options[key])
 
diff --git a/embed_video/tests/templatetags/tests_embed_video_tags.py b/embed_video/tests/templatetags/tests_embed_video_tags.py
index db43b8b..feab48d 100644
--- a/embed_video/tests/templatetags/tests_embed_video_tags.py
+++ b/embed_video/tests/templatetags/tests_embed_video_tags.py
@@ -206,6 +206,7 @@ class EmbedTestCase(TestCase):
            {% load embed_video_tags %}
            {% video 'http://www.youtube.com/watch?v=jsrRJyHBvzw' query="rel=1&wmode=transparent" %}
         """
+
         self.assertRenderedTemplate(
             template,
             '<iframe width="480" height="360" '
@@ -240,7 +241,6 @@ class EmbedTestCase(TestCase):
         )
 
 
-
 class EmbedVideoNodeTestCase(TestCase):
     def setUp(self):
         self.parser = Mock()