diff --git a/examples/publisher.js b/examples/publisher.js
index eb02b15..c3d2001 100755
--- a/examples/publisher.js
+++ b/examples/publisher.js
@@ -2,20 +2,20 @@
 
 // This script plays the role of publisher.
 
-var sys = require("sys");
-var redis = require("../lib/redis-client");
-
-//redis.debugMode = true;
-var client = redis.createClient();
+var 
+  sys = require("sys"),
+  client = require("../lib/redis-client").createClient();
 
 // Publish a message once a second to a random channel.
 
-client.stream.addListener("connect", function () {
-    setInterval(function () {
-        var channelName = "channel-" + Math.random().toString().substr(2);
-        var payload = "The time is " + (new Date());
-        client.publish(channelName, payload, function (err, reply) {
-            sys.puts("Published message to " + (reply === 0 ? "no one" : (reply + " subscriber(s).")));
-        });
-    }, 1000); 
-});
+setInterval(function () {
+  var 
+    channelName = "channel-" + Math.random().toString().substr(2),
+    payload = "The time is " + (new Date());
+
+  client.publish(channelName, payload, 
+    function (err, reply) {
+      sys.puts("Published message to " + 
+        (reply === 0 ? "no one" : (reply + " subscriber(s).")));
+    });
+}, 1000); 
diff --git a/examples/subscriber.js b/examples/subscriber.js
index 53de8c4..ea6e976 100755
--- a/examples/subscriber.js
+++ b/examples/subscriber.js
@@ -3,15 +3,13 @@
 // This script plays the role of listener/subscriber/consumer
 // to **all** channels/classes.
 
-var sys = require("sys");
-var redis = require("../lib/redis-client");
+var 
+  sys = require("sys"),
+  client = require("../lib/redis-client").createClient();
 
-//redis.debugMode = true;
-var client = redis.createClient();
-    
-client.stream.addListener("connect", function () {
-    sys.puts("waiting for messages...");
-    client.subscribeTo("*", function (channel, message) {
-        sys.puts("[" + channel + "]: " + message);
-    });
-});
+sys.puts("waiting for messages...");
+
+client.subscribeTo("*", 
+  function (channel, message) {
+    sys.puts("[" + channel + "]: " + message);
+  });