Fixed indent

Fixed indent so we can compare differences in PR.

5 files changed, 946 insertions, 962 deletions

diff --git a/dist/ethereum.js b/dist/ethereum.js
index 30a0a3797..2cab7bdd7 100644
--- a/dist/ethereum.js
+++ b/dist/ethereum.js
@@ -63,69 +63,69 @@ if (XMLHttpRequest) xhr.prototype = XMLHttpRequest.prototype;
 var XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest; // jshint ignore:line
 
 
-var HttpRpcProvider = function (host) {
-    this.handlers = [];
-    this.host = host;
-};
-
-function formatJsonRpcObject(object) {
-    return {
-        jsonrpc: '2.0',
-        method: object.call,
-        params: object.args,
-        id: object._id
+    var HttpRpcProvider = function (host) {
+        this.handlers = [];
+        this.host = host;
     };
-}
 
-function formatJsonRpcMessage(message) {
-    var object = JSON.parse(message);
+    function formatJsonRpcObject(object) {
+        return {
+            jsonrpc: '2.0',
+            method: object.call,
+            params: object.args,
+            id: object._id
+        };
+    }
 
-    return {
-        _id: object.id,
-        data: object.result
-    };
-}
+    function formatJsonRpcMessage(message) {
+        var object = JSON.parse(message);
 
-HttpRpcProvider.prototype.sendRequest = function (payload, cb) {
-    var data = formatJsonRpcObject(payload);
+        return {
+            _id: object.id,
+            data: object.result
+        };
+    }
 
-    var request = new XMLHttpRequest();
-    request.open("POST", this.host, true);
-    request.send(JSON.stringify(data));
-    request.onreadystatechange = function () {
-        if (request.readyState === 4 && cb) {
-            cb(request);
-        }
+    HttpRpcProvider.prototype.sendRequest = function (payload, cb) {
+        var data = formatJsonRpcObject(payload);
+
+        var request = new XMLHttpRequest();
+        request.open("POST", this.host, true);
+        request.send(JSON.stringify(data));
+        request.onreadystatechange = function () {
+            if (request.readyState === 4 && cb) {
+                cb(request);
+            }
+        };
     };
-};
 
-HttpRpcProvider.prototype.send = function (payload) {
-    var self = this;
-    this.sendRequest(payload, function (request) {
-        self.handlers.forEach(function (handler) {
-            handler.call(self, formatJsonRpcMessage(request.responseText));
+    HttpRpcProvider.prototype.send = function (payload) {
+        var self = this;
+        this.sendRequest(payload, function (request) {
+            self.handlers.forEach(function (handler) {
+                handler.call(self, formatJsonRpcMessage(request.responseText));
+            });
         });
-    });
-};
+    };
 
-HttpRpcProvider.prototype.poll = function (payload, id) {
-    var self = this;
-    this.sendRequest(payload, function (request) {
-        var parsed = JSON.parse(request.responseText);
-        if (parsed.result instanceof Array ? parsed.result.length === 0 : !parsed.result) {
-            return;
-        }
-        self.handlers.forEach(function (handler) {
-            handler.call(self, {_event: payload.call, _id: id, data: parsed.result});
+    HttpRpcProvider.prototype.poll = function (payload, id) {
+        var self = this;
+        this.sendRequest(payload, function (request) {
+            var parsed = JSON.parse(request.responseText);
+            if (parsed.result instanceof Array ? parsed.result.length === 0 : !parsed.result) {
+                return;
+            }
+            self.handlers.forEach(function (handler) {
+                handler.call(self, {_event: payload.call, _id: id, data: parsed.result});
+            });
         });
-    });
-};
+    };
 
-Object.defineProperty(HttpRpcProvider.prototype, "onmessage", {
-    set: function (handler) {
-        this.handlers.push(handler);
-    }
-});
+    Object.defineProperty(HttpRpcProvider.prototype, "onmessage", {
+        set: function (handler) {
+            this.handlers.push(handler);
+        }
+    });
 
 module.exports = HttpRpcProvider;
 
@@ -155,437 +155,429 @@ along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 
-function isPromise(o) {
-    return o instanceof Promise;
-}
-
-function flattenPromise (obj) {
-    if (obj instanceof Promise) {
-        return Promise.resolve(obj);
+    function isPromise(o) {
+        return o instanceof Promise;
     }
 
-    if (obj instanceof Array) {
-        return new Promise(function (resolve) {
-            var promises = obj.map(function (o) {
-                return flattenPromise(o);
-            });
+    function flattenPromise (obj) {
+        if (obj instanceof Promise) {
+            return Promise.resolve(obj);
+        }
 
-            return Promise.all(promises).then(function (res) {
-                for (var i = 0; i < obj.length; i++) {
-                    obj[i] = res[i];
-                }
-                resolve(obj);
-            });
-        });
-    }
+        if (obj instanceof Array) {
+            return new Promise(function (resolve) {
+                var promises = obj.map(function (o) {
+                    return flattenPromise(o);
+                });
 
-    if (obj instanceof Object) {
-        return new Promise(function (resolve) {
-            var keys = Object.keys(obj);
-            var promises = keys.map(function (key) {
-                return flattenPromise(obj[key]);
+                return Promise.all(promises).then(function (res) {
+                    for (var i = 0; i < obj.length; i++) {
+                        obj[i] = res[i];
+                    }
+                    resolve(obj);
+                });
             });
+        }
 
-            return Promise.all(promises).then(function (res) {
-                for (var i = 0; i < keys.length; i++) {
-                    obj[keys[i]] = res[i];
-                }
-                resolve(obj);
+        if (obj instanceof Object) {
+            return new Promise(function (resolve) {
+                var keys = Object.keys(obj);
+                var promises = keys.map(function (key) {
+                    return flattenPromise(obj[key]);
+                });
+
+                return Promise.all(promises).then(function (res) {
+                    for (var i = 0; i < keys.length; i++) {
+                        obj[keys[i]] = res[i];
+                    }
+                    resolve(obj);
+                });
             });
-        });
+        }
+
+        return Promise.resolve(obj);
     }
 
-    return Promise.resolve(obj);
-}
+    var ethMethods = function () {
+        var blockCall = function (args) {
+            return typeof args[0] === "string" ? "blockByHash" : "blockByNumber";
+        };
 
-var ethMethods = function () {
-    var blockCall = function (args) {
-        return typeof args[0] === "string" ? "blockByHash" : "blockByNumber";
-    };
-
-    var transactionCall = function (args) {
-        return typeof args[0] === "string" ? 'transactionByHash' : 'transactionByNumber';
-    };
-
-    var uncleCall = function (args) {
-        return typeof args[0] === "string" ? 'uncleByHash' : 'uncleByNumber';
-    };
-
-    var methods = [
-    { name: 'balanceAt', call: 'balanceAt' },
-    { name: 'stateAt', call: 'stateAt' },
-    { name: 'countAt', call: 'countAt'},
-    { name: 'codeAt', call: 'codeAt' },
-    { name: 'transact', call: 'transact' },
-    { name: 'call', call: 'call' },
-    { name: 'block', call: blockCall },
-    { name: 'transaction', call: transactionCall },
-    { name: 'uncle', call: uncleCall },
-    { name: 'compile', call: 'compile' }
-    ];
-    return methods;
-};
-
-var ethProperties = function () {
-    return [
-    { name: 'coinbase', getter: 'coinbase', setter: 'setCoinbase' },
-    { name: 'listening', getter: 'listening', setter: 'setListening' },
-    { name: 'mining', getter: 'mining', setter: 'setMining' },
-    { name: 'gasPrice', getter: 'gasPrice' },
-    { name: 'account', getter: 'account' },
-    { name: 'accounts', getter: 'accounts' },
-    { name: 'peerCount', getter: 'peerCount' },
-    { name: 'defaultBlock', getter: 'defaultBlock', setter: 'setDefaultBlock' },
-    { name: 'number', getter: 'number'}
-    ];
-};
-
-var dbMethods = function () {
-    return [
-    { name: 'put', call: 'put' },
-    { name: 'get', call: 'get' },
-    { name: 'putString', call: 'putString' },
-    { name: 'getString', call: 'getString' }
-    ];
-};
-
-var shhMethods = function () {
-    return [
-    { name: 'post', call: 'post' },
-    { name: 'newIdentity', call: 'newIdentity' },
-    { name: 'haveIdentity', call: 'haveIdentity' },
-    { name: 'newGroup', call: 'newGroup' },
-    { name: 'addToGroup', call: 'addToGroup' }
-    ];
-};
-
-var ethWatchMethods = function () {
-    var newFilter = function (args) {
-        return typeof args[0] === 'string' ? 'newFilterString' : 'newFilter';
-    };
-
-    return [
-    { name: 'newFilter', call: newFilter },
-    { name: 'uninstallFilter', call: 'uninstallFilter' },
-    { name: 'getMessages', call: 'getMessages' }
-    ];
-};
-
-var shhWatchMethods = function () {
-    return [
-    { name: 'newFilter', call: 'shhNewFilter' },
-    { name: 'uninstallFilter', call: 'shhUninstallFilter' },
-    { name: 'getMessage', call: 'shhGetMessages' }
-    ];
-};
-
-var setupMethods = function (obj, methods) {
-    methods.forEach(function (method) {
-        obj[method.name] = function () {
-            return flattenPromise(Array.prototype.slice.call(arguments)).then(function (args) {
-                var call = typeof method.call === "function" ? method.call(args) : method.call;
-                return {call: call, args: args};
-            }).then(function (request) {
-                return new Promise(function (resolve, reject) {
-                    web3.provider.send(request, function (result) {
-                        if (result || typeof result === "boolean") {
-                            resolve(result);
-                            return;
-                        }
-                        reject(result);
-                    });
-                });
-            }).catch(function( err) {
-                console.error(err);
-            });
+        var transactionCall = function (args) {
+            return typeof args[0] === "string" ? 'transactionByHash' : 'transactionByNumber';
         };
-    });
-};
-
-var setupProperties = function (obj, properties) {
-    properties.forEach(function (property) {
-        var proto = {};
-        proto.get = function () {
-            return new Promise(function(resolve, reject) {
-                web3.provider.send({call: property.getter}, function(result) {
-                    resolve(result);
-                });
-            });
+
+        var uncleCall = function (args) {
+            return typeof args[0] === "string" ? 'uncleByHash' : 'uncleByNumber';
+        };
+
+        var methods = [
+        { name: 'balanceAt', call: 'balanceAt' },
+        { name: 'stateAt', call: 'stateAt' },
+        { name: 'countAt', call: 'countAt'},
+        { name: 'codeAt', call: 'codeAt' },
+        { name: 'transact', call: 'transact' },
+        { name: 'call', call: 'call' },
+        { name: 'block', call: blockCall },
+        { name: 'transaction', call: transactionCall },
+        { name: 'uncle', call: uncleCall },
+        { name: 'compile', call: 'compile' }
+        ];
+        return methods;
+    };
+
+    var ethProperties = function () {
+        return [
+        { name: 'coinbase', getter: 'coinbase', setter: 'setCoinbase' },
+        { name: 'listening', getter: 'listening', setter: 'setListening' },
+        { name: 'mining', getter: 'mining', setter: 'setMining' },
+        { name: 'gasPrice', getter: 'gasPrice' },
+        { name: 'account', getter: 'account' },
+        { name: 'accounts', getter: 'accounts' },
+        { name: 'peerCount', getter: 'peerCount' },
+        { name: 'defaultBlock', getter: 'defaultBlock', setter: 'setDefaultBlock' },
+        { name: 'number', getter: 'number'}
+        ];
+    };
+
+    var dbMethods = function () {
+        return [
+        { name: 'put', call: 'put' },
+        { name: 'get', call: 'get' },
+        { name: 'putString', call: 'putString' },
+        { name: 'getString', call: 'getString' }
+        ];
+    };
+
+    var shhMethods = function () {
+        return [
+        { name: 'post', call: 'post' },
+        { name: 'newIdentity', call: 'newIdentity' },
+        { name: 'haveIdentity', call: 'haveIdentity' },
+        { name: 'newGroup', call: 'newGroup' },
+        { name: 'addToGroup', call: 'addToGroup' }
+        ];
+    };
+
+    var ethWatchMethods = function () {
+        var newFilter = function (args) {
+            return typeof args[0] === 'string' ? 'newFilterString' : 'newFilter';
         };
-        if (property.setter) {
-            proto.set = function (val) {
-                return flattenPromise([val]).then(function (args) {
-                    return new Promise(function (resolve) {
-                        web3.provider.send({call: property.setter, args: args}, function (result) {
-                            if (result) {
+
+        return [
+        { name: 'newFilter', call: newFilter },
+        { name: 'uninstallFilter', call: 'uninstallFilter' },
+        { name: 'getMessages', call: 'getMessages' }
+        ];
+    };
+
+    var shhWatchMethods = function () {
+        return [
+        { name: 'newFilter', call: 'shhNewFilter' },
+        { name: 'uninstallFilter', call: 'shhUninstallFilter' },
+        { name: 'getMessage', call: 'shhGetMessages' }
+        ];
+    };
+
+    var setupMethods = function (obj, methods) {
+        methods.forEach(function (method) {
+            obj[method.name] = function () {
+                return flattenPromise(Array.prototype.slice.call(arguments)).then(function (args) {
+                    var call = typeof method.call === "function" ? method.call(args) : method.call;
+                    return {call: call, args: args};
+                }).then(function (request) {
+                    return new Promise(function (resolve, reject) {
+                        web3.provider.send(request, function (result) {
+                            if (result || typeof result === "boolean") {
                                 resolve(result);
-                            } else {
-                                reject(result);
+                                return;
                             }
+                            reject(result);
                         });
                     });
-                }).catch(function (err) {
+                }).catch(function( err) {
                     console.error(err);
                 });
             };
-        }
-        Object.defineProperty(obj, property.name, proto);
-    });
-};
-
-var web3 = {
-    _callbacks: {},
-    _events: {},
-    providers: {},
-    toHex: function(str) {
-        var hex = "";
-        for(var i = 0; i < str.length; i++) {
-            var n = str.charCodeAt(i).toString(16);
-            hex += n.length < 2 ? '0' + n : n;
-        }
+        });
+    };
+
+    var setupProperties = function (obj, properties) {
+        properties.forEach(function (property) {
+            var proto = {};
+            proto.get = function () {
+                return new Promise(function(resolve, reject) {
+                    web3.provider.send({call: property.getter}, function(result) {
+                        resolve(result);
+                    });
+                });
+            };
+            if (property.setter) {
+                proto.set = function (val) {
+                    return flattenPromise([val]).then(function (args) {
+                        return new Promise(function (resolve) {
+                            web3.provider.send({call: property.setter, args: args}, function (result) {
+                                if (result) {
+                                    resolve(result);
+                                } else {
+                                    reject(result);
+                                }
+                            });
+                        });
+                    }).catch(function (err) {
+                        console.error(err);
+                    });
+                };
+            }
+            Object.defineProperty(obj, property.name, proto);
+        });
+    };
+
+    var web3 = {
+        _callbacks: {},
+        _events: {},
+        providers: {},
+        toHex: function(str) {
+            var hex = "";
+            for(var i = 0; i < str.length; i++) {
+                var n = str.charCodeAt(i).toString(16);
+                hex += n.length < 2 ? '0' + n : n;
+            }
+
+            return hex;
+        },
+
+        toAscii: function(hex) {
+            // Find termination
+            var str = "";
+            var i = 0, l = hex.length;
+            for(; i < l; i+=2) {
+                var code = hex.charCodeAt(i);
+                if(code === 0) {
+                    break;
+                }
+
+                str += String.fromCharCode(parseInt(hex.substr(i, 2), 16));
+            }
 
-        return hex;
-    },
-
-    toAscii: function(hex) {
-        // Find termination
-        var str = "";
-        var i = 0, l = hex.length;
-        for(; i < l; i+=2) {
-            var code = hex.charCodeAt(i);
-            if(code === 0) {
-                break;
+            return str;
+        },
+
+        toDecimal: function (val) {
+            return parseInt(val, 16);
+        },
+
+        fromAscii: function(str, pad) {
+            pad = pad === undefined ? 32 : pad;
+            var hex = this.toHex(str);
+            while(hex.length < pad*2)
+                hex += "00";
+            return hex;
+        },
+
+        eth: {
+            prototype: Object(), // jshint ignore:line
+            watch: function (params) {
+                return new Filter(params, ethWatch);
             }
+        },
 
-            str += String.fromCharCode(parseInt(hex.substr(i, 2), 16));
+        db: {
+            prototype: Object() // jshint ignore:line
+        },
+
+        shh: {
+            prototype: Object(), // jshint ignore:line
+            watch: function (params) {
+                return new Filter(params, shhWatch);
+            }
+        },
+
+        on: function(event, id, cb) {
+            if(web3._events[event] === undefined) {
+                web3._events[event] = {};
+            }
+
+            web3._events[event][id] = cb;
+            return this;
+        },
+
+        off: function(event, id) {
+            if(web3._events[event] !== undefined) {
+                delete web3._events[event][id];
+            }
+
+            return this;
+        },
+
+        trigger: function(event, id, data) {
+            var callbacks = web3._events[event];
+            if (!callbacks || !callbacks[id]) {
+                return;
+            }
+            var cb = callbacks[id];
+            cb(data);
         }
+    };
 
-        return str;
-    },
-
-    toDecimal: function (val) {
-        return parseInt(val, 16);
-    },
-
-    fromAscii: function(str, pad) {
-        pad = pad === undefined ? 32 : pad;
-        var hex = this.toHex(str);
-        while(hex.length < pad*2)
-            hex += "00";
-        return hex;
-    },
-
-    eth: {
-        prototype: Object(), // jshint ignore:line
-        watch: function (params) {
-            return new Filter(params, ethWatch);
+    var eth = web3.eth;
+    setupMethods(eth, ethMethods());
+    setupProperties(eth, ethProperties());
+    setupMethods(web3.db, dbMethods());
+    setupMethods(web3.shh, shhMethods());
+
+    var ethWatch = {
+        changed: 'changed'
+    };
+    setupMethods(ethWatch, ethWatchMethods());
+    var shhWatch = {
+        changed: 'shhChanged'
+    };
+    setupMethods(shhWatch, shhWatchMethods());
+
+    var ProviderManager = function() {
+        this.queued = [];
+        this.polls = [];
+        this.ready = false;
+        this.provider = undefined;
+        this.id = 1;
+
+        var self = this;
+        var poll = function () {
+            if (self.provider && self.provider.poll) {
+                self.polls.forEach(function (data) {
+                    data.data._id = self.id;
+                    self.id++;
+                    self.provider.poll(data.data, data.id);
+                });
+            }
+            setTimeout(poll, 12000);
+        };
+        poll();
+    };
+
+    ProviderManager.prototype.send = function(data, cb) {
+        data._id = this.id;
+        if (cb) {
+            web3._callbacks[data._id] = cb;
         }
-    },
 
-    db: {
-        prototype: Object() // jshint ignore:line
-    },
+        data.args = data.args || [];
+        this.id++;
 
-    shh: {
-        prototype: Object(), // jshint ignore:line
-        watch: function (params) {
-            return new Filter(params, shhWatch);
+        if(this.provider !== undefined) {
+            this.provider.send(data);
+        } else {
+            console.warn("provider is not set");
+            this.queued.push(data);
         }
-    },
+    };
 
-    on: function(event, id, cb) {
-        if(web3._events[event] === undefined) {
-            web3._events[event] = {};
+    ProviderManager.prototype.set = function(provider) {
+        if(this.provider !== undefined && this.provider.unload !== undefined) {
+            this.provider.unload();
         }
 
-        web3._events[event][id] = cb;
-        return this;
-    },
+        this.provider = provider;
+        this.ready = true;
+    };
 
-    off: function(event, id) {
-        if(web3._events[event] !== undefined) {
-            delete web3._events[event][id];
+    ProviderManager.prototype.sendQueued = function() {
+        for(var i = 0; this.queued.length; i++) {
+            // Resend
+            this.send(this.queued[i]);
         }
+    };
 
-        return this;
-    },
+    ProviderManager.prototype.installed = function() {
+        return this.provider !== undefined;
+    };
 
-    trigger: function(event, id, data) {
-        var callbacks = web3._events[event];
-        if (!callbacks || !callbacks[id]) {
+    ProviderManager.prototype.startPolling = function (data, pollId) {
+        if (!this.provider || !this.provider.poll) {
             return;
         }
-        var cb = callbacks[id];
-        cb(data);
-    }
-};
-
-var eth = web3.eth;
-setupMethods(eth, ethMethods());
-setupProperties(eth, ethProperties());
-setupMethods(web3.db, dbMethods());
-setupMethods(web3.shh, shhMethods());
-
-var ethWatch = {
-    changed: 'changed'
-};
-setupMethods(ethWatch, ethWatchMethods());
-var shhWatch = {
-    changed: 'shhChanged'
-};
-setupMethods(shhWatch, shhWatchMethods());
-
-var ProviderManager = function() {
-    this.queued = [];
-    this.polls = [];
-    this.ready = false;
-    this.provider = undefined;
-    this.id = 1;
-
-    var self = this;
-    var poll = function () {
-        if (self.provider && self.provider.poll) {
-            self.polls.forEach(function (data) {
-                data.data._id = self.id;
-                self.id++;
-                self.provider.poll(data.data, data.id);
-            });
-        }
-        setTimeout(poll, 12000);
+        this.polls.push({data: data, id: pollId});
     };
-    poll();
-};
 
-ProviderManager.prototype.send = function(data, cb) {
-    data._id = this.id;
-    if (cb) {
-        web3._callbacks[data._id] = cb;
-    }
+    ProviderManager.prototype.stopPolling = function (pollId) {
+        for (var i = this.polls.length; i--;) {
+            var poll = this.polls[i];
+            if (poll.id === pollId) {
+                this.polls.splice(i, 1);
+            }
+        }
+    };
 
-    data.args = data.args || [];
-    this.id++;
+    web3.provider = new ProviderManager();
 
-    if(this.provider !== undefined) {
-        this.provider.send(data);
-    } else {
-        console.warn("provider is not set");
-        this.queued.push(data);
-    }
-};
+    web3.setProvider = function(provider) {
+        provider.onmessage = messageHandler;
+        web3.provider.set(provider);
+        web3.provider.sendQueued();
+    };
 
-ProviderManager.prototype.set = function(provider) {
-    if(this.provider !== undefined && this.provider.unload !== undefined) {
-        this.provider.unload();
-    }
+    var Filter = function(options, impl) {
+        this.impl = impl;
+        this.callbacks = [];
 
-    this.provider = provider;
-    this.ready = true;
-};
+        var self = this;
+        this.promise = impl.newFilter(options);
+        this.promise.then(function (id) {
+            self.id = id;
+            web3.on(impl.changed, id, self.trigger.bind(self));
+            web3.provider.startPolling({call: impl.changed, args: [id]}, id);
+        });
+    };
 
-ProviderManager.prototype.sendQueued = function() {
-    for(var i = 0; this.queued.length; i++) {
-        // Resend
-        this.send(this.queued[i]);
-    }
-};
+    Filter.prototype.arrived = function(callback) {
+        this.changed(callback);
+    };
 
-ProviderManager.prototype.installed = function() {
-    return this.provider !== undefined;
-};
+    Filter.prototype.changed = function(callback) {
+        var self = this;
+        this.promise.then(function(id) {
+            self.callbacks.push(callback);
+        });
+    };
 
-ProviderManager.prototype.startPolling = function (data, pollId) {
-    if (!this.provider || !this.provider.poll) {
-        return;
-    }
-    this.polls.push({data: data, id: pollId});
-};
-
-ProviderManager.prototype.stopPolling = function (pollId) {
-    for (var i = this.polls.length; i--;) {
-        var poll = this.polls[i];
-        if (poll.id === pollId) {
-            this.polls.splice(i, 1);
+    Filter.prototype.trigger = function(messages) {
+        for(var i = 0; i < this.callbacks.length; i++) {
+            this.callbacks[i].call(this, messages);
         }
-    }
-};
-
-web3.provider = new ProviderManager();
-
-web3.setProvider = function(provider) {
-    provider.onmessage = messageHandler;
-    web3.provider.set(provider);
-    web3.provider.sendQueued();
-};
-
-var Filter = function(options, impl) {
-    this.impl = impl;
-    this.callbacks = [];
-
-    var self = this;
-    this.promise = impl.newFilter(options);
-    this.promise.then(function (id) {
-        self.id = id;
-        web3.on(impl.changed, id, self.trigger.bind(self));
-        web3.provider.startPolling({call: impl.changed, args: [id]}, id);
-    });
-};
-
-Filter.prototype.arrived = function(callback) {
-    this.changed(callback);
-};
-
-Filter.prototype.changed = function(callback) {
-    var self = this;
-    this.promise.then(function(id) {
-        self.callbacks.push(callback);
-    });
-};
+    };
 
-Filter.prototype.trigger = function(messages) {
-    for(var i = 0; i < this.callbacks.length; i++) {
-        this.callbacks[i].call(this, messages);
-    }
-};
-
-Filter.prototype.uninstall = function() {
-    var self = this;
-    this.promise.then(function (id) {
-        self.impl.uninstallFilter(id);
-        web3.provider.stopPolling(id);
-        web3.off(impl.changed, id);
-    });
-};
+    Filter.prototype.uninstall = function() {
+        var self = this;
+        this.promise.then(function (id) {
+            self.impl.uninstallFilter(id);
+            web3.provider.stopPolling(id);
+            web3.off(impl.changed, id);
+        });
+    };
 
-Filter.prototype.messages = function() {
-    var self = this;
-    return this.promise.then(function (id) {
-        return self.impl.getMessages(id);
-    });
-};
+    Filter.prototype.messages = function() {
+        var self = this;
+        return this.promise.then(function (id) {
+            return self.impl.getMessages(id);
+        });
+    };
 
-function messageHandler(data) {
-    if(data._event !== undefined) {
-        web3.trigger(data._event, data._id, data.data);
-        return;
-    }
+    function messageHandler(data) {
+        if(data._event !== undefined) {
+            web3.trigger(data._event, data._id, data.data);
+            return;
+        }
 
-    if(data._id) {
-        var cb = web3._callbacks[data._id];
-        if (cb) {
-            cb.call(this, data.data);
-            delete web3._callbacks[data._id];
+        if(data._id) {
+            var cb = web3._callbacks[data._id];
+            if (cb) {
+                cb.call(this, data.data);
+                delete web3._callbacks[data._id];
+            }
         }
     }
-}
 
-/*
-// Install default provider
-if(!web3.provider.installed()) {
-    var sock = new web3.providers.WebSocketProvider("ws://localhost:40404/eth");
-
-    web3.setProvider(sock);
-}
-*/
 
 module.exports = web3;
 
@@ -612,26 +604,26 @@ module.exports = web3;
  * @date 2014
  */
 
-var QtProvider = function() {
-    this.handlers = [];
+    var QtProvider = function() {
+        this.handlers = [];
 
-    var self = this;
-    navigator.qt.onmessage = function (message) {
-        self.handlers.forEach(function (handler) {
-            handler.call(self, JSON.parse(message.data));
-        });
+        var self = this;
+        navigator.qt.onmessage = function (message) {
+            self.handlers.forEach(function (handler) {
+                handler.call(self, JSON.parse(message.data));
+            });
+        };
     };
-};
 
-QtProvider.prototype.send = function(payload) {
-    navigator.qt.postMessage(JSON.stringify(payload));
-};
+    QtProvider.prototype.send = function(payload) {
+        navigator.qt.postMessage(JSON.stringify(payload));
+    };
 
-Object.defineProperty(QtProvider.prototype, "onmessage", {
-    set: function(handler) {
-        this.handlers.push(handler);
-    }
-});
+    Object.defineProperty(QtProvider.prototype, "onmessage", {
+        set: function(handler) {
+            this.handlers.push(handler);
+        }
+    });
 
 module.exports = QtProvider;
 
@@ -662,51 +654,51 @@ module.exports = QtProvider;
 var WebSocket = require('ws'); // jshint ignore:line
 
 
-var WebSocketProvider = function(host) {
-    // onmessage handlers
-    this.handlers = [];
-    // queue will be filled with messages if send is invoked before the ws is ready
-    this.queued = [];
-    this.ready = false;
+    var WebSocketProvider = function(host) {
+        // onmessage handlers
+        this.handlers = [];
+        // queue will be filled with messages if send is invoked before the ws is ready
+        this.queued = [];
+        this.ready = false;
 
-    this.ws = new WebSocket(host);
+        this.ws = new WebSocket(host);
 
-    var self = this;
-    this.ws.onmessage = function(event) {
-        for(var i = 0; i < self.handlers.length; i++) {
-            self.handlers[i].call(self, JSON.parse(event.data), event);
-        }
-    };
+        var self = this;
+        this.ws.onmessage = function(event) {
+            for(var i = 0; i < self.handlers.length; i++) {
+                self.handlers[i].call(self, JSON.parse(event.data), event);
+            }
+        };
 
-    this.ws.onopen = function() {
-        self.ready = true;
+        this.ws.onopen = function() {
+            self.ready = true;
 
-        for(var i = 0; i < self.queued.length; i++) {
-            // Resend
-            self.send(self.queued[i]);
+            for(var i = 0; i < self.queued.length; i++) {
+                // Resend
+                self.send(self.queued[i]);
+            }
+        };
+    };
+    WebSocketProvider.prototype.send = function(payload) {
+        if(this.ready) {
+            var data = JSON.stringify(payload);
+
+            this.ws.send(data);
+        } else {
+            this.queued.push(payload);
         }
     };
-};
-WebSocketProvider.prototype.send = function(payload) {
-    if(this.ready) {
-        var data = JSON.stringify(payload);
 
-        this.ws.send(data);
-    } else {
-        this.queued.push(payload);
-    }
-};
-
-WebSocketProvider.prototype.onMessage = function(handler) {
-    this.handlers.push(handler);
-};
-
-WebSocketProvider.prototype.unload = function() {
-    this.ws.close();
-};
-Object.defineProperty(WebSocketProvider.prototype, "onmessage", {
-    set: function(provider) { this.onMessage(provider); }
-});
+    WebSocketProvider.prototype.onMessage = function(handler) {
+        this.handlers.push(handler);
+    };
+
+    WebSocketProvider.prototype.unload = function() {
+        this.ws.close();
+    };
+    Object.defineProperty(WebSocketProvider.prototype, "onmessage", {
+        set: function(provider) { this.onMessage(provider); }
+    });
 
 module.exports = WebSocketProvider;
 
diff --git a/lib/httprpc.js b/lib/httprpc.js
index b80cca048..1968caa98 100644
--- a/lib/httprpc.js
+++ b/lib/httprpc.js
@@ -25,68 +25,68 @@
 var XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest; // jshint ignore:line
 
 
-var HttpRpcProvider = function (host) {
-    this.handlers = [];
-    this.host = host;
-};
-
-function formatJsonRpcObject(object) {
-    return {
-        jsonrpc: '2.0',
-        method: object.call,
-        params: object.args,
-        id: object._id
+    var HttpRpcProvider = function (host) {
+        this.handlers = [];
+        this.host = host;
     };
-}
 
-function formatJsonRpcMessage(message) {
-    var object = JSON.parse(message);
+    function formatJsonRpcObject(object) {
+        return {
+            jsonrpc: '2.0',
+            method: object.call,
+            params: object.args,
+            id: object._id
+        };
+    }
 
-    return {
-        _id: object.id,
-        data: object.result
-    };
-}
+    function formatJsonRpcMessage(message) {
+        var object = JSON.parse(message);
 
-HttpRpcProvider.prototype.sendRequest = function (payload, cb) {
-    var data = formatJsonRpcObject(payload);
+        return {
+            _id: object.id,
+            data: object.result
+        };
+    }
 
-    var request = new XMLHttpRequest();
-    request.open("POST", this.host, true);
-    request.send(JSON.stringify(data));
-    request.onreadystatechange = function () {
-        if (request.readyState === 4 && cb) {
-            cb(request);
-        }
+    HttpRpcProvider.prototype.sendRequest = function (payload, cb) {
+        var data = formatJsonRpcObject(payload);
+
+        var request = new XMLHttpRequest();
+        request.open("POST", this.host, true);
+        request.send(JSON.stringify(data));
+        request.onreadystatechange = function () {
+            if (request.readyState === 4 && cb) {
+                cb(request);
+            }
+        };
     };
-};
 
-HttpRpcProvider.prototype.send = function (payload) {
-    var self = this;
-    this.sendRequest(payload, function (request) {
-        self.handlers.forEach(function (handler) {
-            handler.call(self, formatJsonRpcMessage(request.responseText));
+    HttpRpcProvider.prototype.send = function (payload) {
+        var self = this;
+        this.sendRequest(payload, function (request) {
+            self.handlers.forEach(function (handler) {
+                handler.call(self, formatJsonRpcMessage(request.responseText));
+            });
         });
-    });
-};
-
-HttpRpcProvider.prototype.poll = function (payload, id) {
-    var self = this;
-    this.sendRequest(payload, function (request) {
-        var parsed = JSON.parse(request.responseText);
-        if (parsed.result instanceof Array ? parsed.result.length === 0 : !parsed.result) {
-            return;
-        }
-        self.handlers.forEach(function (handler) {
-            handler.call(self, {_event: payload.call, _id: id, data: parsed.result});
+    };
+
+    HttpRpcProvider.prototype.poll = function (payload, id) {
+        var self = this;
+        this.sendRequest(payload, function (request) {
+            var parsed = JSON.parse(request.responseText);
+            if (parsed.result instanceof Array ? parsed.result.length === 0 : !parsed.result) {
+                return;
+            }
+            self.handlers.forEach(function (handler) {
+                handler.call(self, {_event: payload.call, _id: id, data: parsed.result});
+            });
         });
-    });
-};
+    };
 
-Object.defineProperty(HttpRpcProvider.prototype, "onmessage", {
-    set: function (handler) {
-        this.handlers.push(handler);
-    }
-});
+    Object.defineProperty(HttpRpcProvider.prototype, "onmessage", {
+        set: function (handler) {
+            this.handlers.push(handler);
+        }
+    });
 
 module.exports = HttpRpcProvider;
diff --git a/lib/main.js b/lib/main.js
index 966b1ac98..580f1ea7c 100644
--- a/lib/main.js
+++ b/lib/main.js
@@ -23,436 +23,428 @@ along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 
-function isPromise(o) {
-    return o instanceof Promise;
-}
-
-function flattenPromise (obj) {
-    if (obj instanceof Promise) {
-        return Promise.resolve(obj);
+    function isPromise(o) {
+        return o instanceof Promise;
     }
 
-    if (obj instanceof Array) {
-        return new Promise(function (resolve) {
-            var promises = obj.map(function (o) {
-                return flattenPromise(o);
-            });
+    function flattenPromise (obj) {
+        if (obj instanceof Promise) {
+            return Promise.resolve(obj);
+        }
 
-            return Promise.all(promises).then(function (res) {
-                for (var i = 0; i < obj.length; i++) {
-                    obj[i] = res[i];
-                }
-                resolve(obj);
-            });
-        });
-    }
+        if (obj instanceof Array) {
+            return new Promise(function (resolve) {
+                var promises = obj.map(function (o) {
+                    return flattenPromise(o);
+                });
 
-    if (obj instanceof Object) {
-        return new Promise(function (resolve) {
-            var keys = Object.keys(obj);
-            var promises = keys.map(function (key) {
-                return flattenPromise(obj[key]);
+                return Promise.all(promises).then(function (res) {
+                    for (var i = 0; i < obj.length; i++) {
+                        obj[i] = res[i];
+                    }
+                    resolve(obj);
+                });
             });
+        }
 
-            return Promise.all(promises).then(function (res) {
-                for (var i = 0; i < keys.length; i++) {
-                    obj[keys[i]] = res[i];
-                }
-                resolve(obj);
+        if (obj instanceof Object) {
+            return new Promise(function (resolve) {
+                var keys = Object.keys(obj);
+                var promises = keys.map(function (key) {
+                    return flattenPromise(obj[key]);
+                });
+
+                return Promise.all(promises).then(function (res) {
+                    for (var i = 0; i < keys.length; i++) {
+                        obj[keys[i]] = res[i];
+                    }
+                    resolve(obj);
+                });
             });
-        });
+        }
+
+        return Promise.resolve(obj);
     }
 
-    return Promise.resolve(obj);
-}
+    var ethMethods = function () {
+        var blockCall = function (args) {
+            return typeof args[0] === "string" ? "blockByHash" : "blockByNumber";
+        };
+
+        var transactionCall = function (args) {
+            return typeof args[0] === "string" ? 'transactionByHash' : 'transactionByNumber';
+        };
+
+        var uncleCall = function (args) {
+            return typeof args[0] === "string" ? 'uncleByHash' : 'uncleByNumber';
+        };
 
-var ethMethods = function () {
-    var blockCall = function (args) {
-        return typeof args[0] === "string" ? "blockByHash" : "blockByNumber";
+        var methods = [
+        { name: 'balanceAt', call: 'balanceAt' },
+        { name: 'stateAt', call: 'stateAt' },
+        { name: 'countAt', call: 'countAt'},
+        { name: 'codeAt', call: 'codeAt' },
+        { name: 'transact', call: 'transact' },
+        { name: 'call', call: 'call' },
+        { name: 'block', call: blockCall },
+        { name: 'transaction', call: transactionCall },
+        { name: 'uncle', call: uncleCall },
+        { name: 'compile', call: 'compile' }
+        ];
+        return methods;
     };
 
-    var transactionCall = function (args) {
-        return typeof args[0] === "string" ? 'transactionByHash' : 'transactionByNumber';
+    var ethProperties = function () {
+        return [
+        { name: 'coinbase', getter: 'coinbase', setter: 'setCoinbase' },
+        { name: 'listening', getter: 'listening', setter: 'setListening' },
+        { name: 'mining', getter: 'mining', setter: 'setMining' },
+        { name: 'gasPrice', getter: 'gasPrice' },
+        { name: 'account', getter: 'account' },
+        { name: 'accounts', getter: 'accounts' },
+        { name: 'peerCount', getter: 'peerCount' },
+        { name: 'defaultBlock', getter: 'defaultBlock', setter: 'setDefaultBlock' },
+        { name: 'number', getter: 'number'}
+        ];
     };
 
-    var uncleCall = function (args) {
-        return typeof args[0] === "string" ? 'uncleByHash' : 'uncleByNumber';
+    var dbMethods = function () {
+        return [
+        { name: 'put', call: 'put' },
+        { name: 'get', call: 'get' },
+        { name: 'putString', call: 'putString' },
+        { name: 'getString', call: 'getString' }
+        ];
     };
 
-    var methods = [
-    { name: 'balanceAt', call: 'balanceAt' },
-    { name: 'stateAt', call: 'stateAt' },
-    { name: 'countAt', call: 'countAt'},
-    { name: 'codeAt', call: 'codeAt' },
-    { name: 'transact', call: 'transact' },
-    { name: 'call', call: 'call' },
-    { name: 'block', call: blockCall },
-    { name: 'transaction', call: transactionCall },
-    { name: 'uncle', call: uncleCall },
-    { name: 'compile', call: 'compile' }
-    ];
-    return methods;
-};
-
-var ethProperties = function () {
-    return [
-    { name: 'coinbase', getter: 'coinbase', setter: 'setCoinbase' },
-    { name: 'listening', getter: 'listening', setter: 'setListening' },
-    { name: 'mining', getter: 'mining', setter: 'setMining' },
-    { name: 'gasPrice', getter: 'gasPrice' },
-    { name: 'account', getter: 'account' },
-    { name: 'accounts', getter: 'accounts' },
-    { name: 'peerCount', getter: 'peerCount' },
-    { name: 'defaultBlock', getter: 'defaultBlock', setter: 'setDefaultBlock' },
-    { name: 'number', getter: 'number'}
-    ];
-};
-
-var dbMethods = function () {
-    return [
-    { name: 'put', call: 'put' },
-    { name: 'get', call: 'get' },
-    { name: 'putString', call: 'putString' },
-    { name: 'getString', call: 'getString' }
-    ];
-};
-
-var shhMethods = function () {
-    return [
-    { name: 'post', call: 'post' },
-    { name: 'newIdentity', call: 'newIdentity' },
-    { name: 'haveIdentity', call: 'haveIdentity' },
-    { name: 'newGroup', call: 'newGroup' },
-    { name: 'addToGroup', call: 'addToGroup' }
-    ];
-};
-
-var ethWatchMethods = function () {
-    var newFilter = function (args) {
-        return typeof args[0] === 'string' ? 'newFilterString' : 'newFilter';
+    var shhMethods = function () {
+        return [
+        { name: 'post', call: 'post' },
+        { name: 'newIdentity', call: 'newIdentity' },
+        { name: 'haveIdentity', call: 'haveIdentity' },
+        { name: 'newGroup', call: 'newGroup' },
+        { name: 'addToGroup', call: 'addToGroup' }
+        ];
     };
 
-    return [
-    { name: 'newFilter', call: newFilter },
-    { name: 'uninstallFilter', call: 'uninstallFilter' },
-    { name: 'getMessages', call: 'getMessages' }
-    ];
-};
-
-var shhWatchMethods = function () {
-    return [
-    { name: 'newFilter', call: 'shhNewFilter' },
-    { name: 'uninstallFilter', call: 'shhUninstallFilter' },
-    { name: 'getMessage', call: 'shhGetMessages' }
-    ];
-};
-
-var setupMethods = function (obj, methods) {
-    methods.forEach(function (method) {
-        obj[method.name] = function () {
-            return flattenPromise(Array.prototype.slice.call(arguments)).then(function (args) {
-                var call = typeof method.call === "function" ? method.call(args) : method.call;
-                return {call: call, args: args};
-            }).then(function (request) {
-                return new Promise(function (resolve, reject) {
-                    web3.provider.send(request, function (result) {
-                        if (result || typeof result === "boolean") {
-                            resolve(result);
-                            return;
-                        }
-                        reject(result);
-                    });
-                });
-            }).catch(function( err) {
-                console.error(err);
-            });
-        };
-    });
-};
-
-var setupProperties = function (obj, properties) {
-    properties.forEach(function (property) {
-        var proto = {};
-        proto.get = function () {
-            return new Promise(function(resolve, reject) {
-                web3.provider.send({call: property.getter}, function(result) {
-                    resolve(result);
-                });
-            });
+    var ethWatchMethods = function () {
+        var newFilter = function (args) {
+            return typeof args[0] === 'string' ? 'newFilterString' : 'newFilter';
         };
-        if (property.setter) {
-            proto.set = function (val) {
-                return flattenPromise([val]).then(function (args) {
-                    return new Promise(function (resolve) {
-                        web3.provider.send({call: property.setter, args: args}, function (result) {
-                            if (result) {
+
+        return [
+        { name: 'newFilter', call: newFilter },
+        { name: 'uninstallFilter', call: 'uninstallFilter' },
+        { name: 'getMessages', call: 'getMessages' }
+        ];
+    };
+
+    var shhWatchMethods = function () {
+        return [
+        { name: 'newFilter', call: 'shhNewFilter' },
+        { name: 'uninstallFilter', call: 'shhUninstallFilter' },
+        { name: 'getMessage', call: 'shhGetMessages' }
+        ];
+    };
+
+    var setupMethods = function (obj, methods) {
+        methods.forEach(function (method) {
+            obj[method.name] = function () {
+                return flattenPromise(Array.prototype.slice.call(arguments)).then(function (args) {
+                    var call = typeof method.call === "function" ? method.call(args) : method.call;
+                    return {call: call, args: args};
+                }).then(function (request) {
+                    return new Promise(function (resolve, reject) {
+                        web3.provider.send(request, function (result) {
+                            if (result || typeof result === "boolean") {
                                 resolve(result);
-                            } else {
-                                reject(result);
+                                return;
                             }
+                            reject(result);
                         });
                     });
-                }).catch(function (err) {
+                }).catch(function( err) {
                     console.error(err);
                 });
             };
-        }
-        Object.defineProperty(obj, property.name, proto);
-    });
-};
-
-var web3 = {
-    _callbacks: {},
-    _events: {},
-    providers: {},
-    toHex: function(str) {
-        var hex = "";
-        for(var i = 0; i < str.length; i++) {
-            var n = str.charCodeAt(i).toString(16);
-            hex += n.length < 2 ? '0' + n : n;
-        }
+        });
+    };
+
+    var setupProperties = function (obj, properties) {
+        properties.forEach(function (property) {
+            var proto = {};
+            proto.get = function () {
+                return new Promise(function(resolve, reject) {
+                    web3.provider.send({call: property.getter}, function(result) {
+                        resolve(result);
+                    });
+                });
+            };
+            if (property.setter) {
+                proto.set = function (val) {
+                    return flattenPromise([val]).then(function (args) {
+                        return new Promise(function (resolve) {
+                            web3.provider.send({call: property.setter, args: args}, function (result) {
+                                if (result) {
+                                    resolve(result);
+                                } else {
+                                    reject(result);
+                                }
+                            });
+                        });
+                    }).catch(function (err) {
+                        console.error(err);
+                    });
+                };
+            }
+            Object.defineProperty(obj, property.name, proto);
+        });
+    };
+
+    var web3 = {
+        _callbacks: {},
+        _events: {},
+        providers: {},
+        toHex: function(str) {
+            var hex = "";
+            for(var i = 0; i < str.length; i++) {
+                var n = str.charCodeAt(i).toString(16);
+                hex += n.length < 2 ? '0' + n : n;
+            }
+
+            return hex;
+        },
+
+        toAscii: function(hex) {
+            // Find termination
+            var str = "";
+            var i = 0, l = hex.length;
+            for(; i < l; i+=2) {
+                var code = hex.charCodeAt(i);
+                if(code === 0) {
+                    break;
+                }
 
-        return hex;
-    },
-
-    toAscii: function(hex) {
-        // Find termination
-        var str = "";
-        var i = 0, l = hex.length;
-        for(; i < l; i+=2) {
-            var code = hex.charCodeAt(i);
-            if(code === 0) {
-                break;
+                str += String.fromCharCode(parseInt(hex.substr(i, 2), 16));
             }
 
-            str += String.fromCharCode(parseInt(hex.substr(i, 2), 16));
+            return str;
+        },
+
+        toDecimal: function (val) {
+            return parseInt(val, 16);
+        },
+
+        fromAscii: function(str, pad) {
+            pad = pad === undefined ? 32 : pad;
+            var hex = this.toHex(str);
+            while(hex.length < pad*2)
+                hex += "00";
+            return hex;
+        },
+
+        eth: {
+            prototype: Object(), // jshint ignore:line
+            watch: function (params) {
+                return new Filter(params, ethWatch);
+            }
+        },
+
+        db: {
+            prototype: Object() // jshint ignore:line
+        },
+
+        shh: {
+            prototype: Object(), // jshint ignore:line
+            watch: function (params) {
+                return new Filter(params, shhWatch);
+            }
+        },
+
+        on: function(event, id, cb) {
+            if(web3._events[event] === undefined) {
+                web3._events[event] = {};
+            }
+
+            web3._events[event][id] = cb;
+            return this;
+        },
+
+        off: function(event, id) {
+            if(web3._events[event] !== undefined) {
+                delete web3._events[event][id];
+            }
+
+            return this;
+        },
+
+        trigger: function(event, id, data) {
+            var callbacks = web3._events[event];
+            if (!callbacks || !callbacks[id]) {
+                return;
+            }
+            var cb = callbacks[id];
+            cb(data);
         }
+    };
+
+    var eth = web3.eth;
+    setupMethods(eth, ethMethods());
+    setupProperties(eth, ethProperties());
+    setupMethods(web3.db, dbMethods());
+    setupMethods(web3.shh, shhMethods());
+
+    var ethWatch = {
+        changed: 'changed'
+    };
+    setupMethods(ethWatch, ethWatchMethods());
+    var shhWatch = {
+        changed: 'shhChanged'
+    };
+    setupMethods(shhWatch, shhWatchMethods());
+
+    var ProviderManager = function() {
+        this.queued = [];
+        this.polls = [];
+        this.ready = false;
+        this.provider = undefined;
+        this.id = 1;
+
+        var self = this;
+        var poll = function () {
+            if (self.provider && self.provider.poll) {
+                self.polls.forEach(function (data) {
+                    data.data._id = self.id;
+                    self.id++;
+                    self.provider.poll(data.data, data.id);
+                });
+            }
+            setTimeout(poll, 12000);
+        };
+        poll();
+    };
 
-        return str;
-    },
-
-    toDecimal: function (val) {
-        return parseInt(val, 16);
-    },
-
-    fromAscii: function(str, pad) {
-        pad = pad === undefined ? 32 : pad;
-        var hex = this.toHex(str);
-        while(hex.length < pad*2)
-            hex += "00";
-        return hex;
-    },
-
-    eth: {
-        prototype: Object(), // jshint ignore:line
-        watch: function (params) {
-            return new Filter(params, ethWatch);
+    ProviderManager.prototype.send = function(data, cb) {
+        data._id = this.id;
+        if (cb) {
+            web3._callbacks[data._id] = cb;
         }
-    },
 
-    db: {
-        prototype: Object() // jshint ignore:line
-    },
+        data.args = data.args || [];
+        this.id++;
 
-    shh: {
-        prototype: Object(), // jshint ignore:line
-        watch: function (params) {
-            return new Filter(params, shhWatch);
+        if(this.provider !== undefined) {
+            this.provider.send(data);
+        } else {
+            console.warn("provider is not set");
+            this.queued.push(data);
         }
-    },
+    };
 
-    on: function(event, id, cb) {
-        if(web3._events[event] === undefined) {
-            web3._events[event] = {};
+    ProviderManager.prototype.set = function(provider) {
+        if(this.provider !== undefined && this.provider.unload !== undefined) {
+            this.provider.unload();
         }
 
-        web3._events[event][id] = cb;
-        return this;
-    },
+        this.provider = provider;
+        this.ready = true;
+    };
 
-    off: function(event, id) {
-        if(web3._events[event] !== undefined) {
-            delete web3._events[event][id];
+    ProviderManager.prototype.sendQueued = function() {
+        for(var i = 0; this.queued.length; i++) {
+            // Resend
+            this.send(this.queued[i]);
         }
+    };
 
-        return this;
-    },
+    ProviderManager.prototype.installed = function() {
+        return this.provider !== undefined;
+    };
 
-    trigger: function(event, id, data) {
-        var callbacks = web3._events[event];
-        if (!callbacks || !callbacks[id]) {
+    ProviderManager.prototype.startPolling = function (data, pollId) {
+        if (!this.provider || !this.provider.poll) {
             return;
         }
-        var cb = callbacks[id];
-        cb(data);
-    }
-};
-
-var eth = web3.eth;
-setupMethods(eth, ethMethods());
-setupProperties(eth, ethProperties());
-setupMethods(web3.db, dbMethods());
-setupMethods(web3.shh, shhMethods());
-
-var ethWatch = {
-    changed: 'changed'
-};
-setupMethods(ethWatch, ethWatchMethods());
-var shhWatch = {
-    changed: 'shhChanged'
-};
-setupMethods(shhWatch, shhWatchMethods());
-
-var ProviderManager = function() {
-    this.queued = [];
-    this.polls = [];
-    this.ready = false;
-    this.provider = undefined;
-    this.id = 1;
-
-    var self = this;
-    var poll = function () {
-        if (self.provider && self.provider.poll) {
-            self.polls.forEach(function (data) {
-                data.data._id = self.id;
-                self.id++;
-                self.provider.poll(data.data, data.id);
-            });
+        this.polls.push({data: data, id: pollId});
+    };
+
+    ProviderManager.prototype.stopPolling = function (pollId) {
+        for (var i = this.polls.length; i--;) {
+            var poll = this.polls[i];
+            if (poll.id === pollId) {
+                this.polls.splice(i, 1);
+            }
         }
-        setTimeout(poll, 12000);
     };
-    poll();
-};
 
-ProviderManager.prototype.send = function(data, cb) {
-    data._id = this.id;
-    if (cb) {
-        web3._callbacks[data._id] = cb;
-    }
+    web3.provider = new ProviderManager();
 
-    data.args = data.args || [];
-    this.id++;
+    web3.setProvider = function(provider) {
+        provider.onmessage = messageHandler;
+        web3.provider.set(provider);
+        web3.provider.sendQueued();
+    };
 
-    if(this.provider !== undefined) {
-        this.provider.send(data);
-    } else {
-        console.warn("provider is not set");
-        this.queued.push(data);
-    }
-};
+    var Filter = function(options, impl) {
+        this.impl = impl;
+        this.callbacks = [];
 
-ProviderManager.prototype.set = function(provider) {
-    if(this.provider !== undefined && this.provider.unload !== undefined) {
-        this.provider.unload();
-    }
+        var self = this;
+        this.promise = impl.newFilter(options);
+        this.promise.then(function (id) {
+            self.id = id;
+            web3.on(impl.changed, id, self.trigger.bind(self));
+            web3.provider.startPolling({call: impl.changed, args: [id]}, id);
+        });
+    };
 
-    this.provider = provider;
-    this.ready = true;
-};
+    Filter.prototype.arrived = function(callback) {
+        this.changed(callback);
+    };
 
-ProviderManager.prototype.sendQueued = function() {
-    for(var i = 0; this.queued.length; i++) {
-        // Resend
-        this.send(this.queued[i]);
-    }
-};
+    Filter.prototype.changed = function(callback) {
+        var self = this;
+        this.promise.then(function(id) {
+            self.callbacks.push(callback);
+        });
+    };
 
-ProviderManager.prototype.installed = function() {
-    return this.provider !== undefined;
-};
+    Filter.prototype.trigger = function(messages) {
+        for(var i = 0; i < this.callbacks.length; i++) {
+            this.callbacks[i].call(this, messages);
+        }
+    };
 
-ProviderManager.prototype.startPolling = function (data, pollId) {
-    if (!this.provider || !this.provider.poll) {
-        return;
-    }
-    this.polls.push({data: data, id: pollId});
-};
-
-ProviderManager.prototype.stopPolling = function (pollId) {
-    for (var i = this.polls.length; i--;) {
-        var poll = this.polls[i];
-        if (poll.id === pollId) {
-            this.polls.splice(i, 1);
+    Filter.prototype.uninstall = function() {
+        var self = this;
+        this.promise.then(function (id) {
+            self.impl.uninstallFilter(id);
+            web3.provider.stopPolling(id);
+            web3.off(impl.changed, id);
+        });
+    };
+
+    Filter.prototype.messages = function() {
+        var self = this;
+        return this.promise.then(function (id) {
+            return self.impl.getMessages(id);
+        });
+    };
+
+    function messageHandler(data) {
+        if(data._event !== undefined) {
+            web3.trigger(data._event, data._id, data.data);
+            return;
         }
-    }
-};
-
-web3.provider = new ProviderManager();
-
-web3.setProvider = function(provider) {
-    provider.onmessage = messageHandler;
-    web3.provider.set(provider);
-    web3.provider.sendQueued();
-};
-
-var Filter = function(options, impl) {
-    this.impl = impl;
-    this.callbacks = [];
-
-    var self = this;
-    this.promise = impl.newFilter(options);
-    this.promise.then(function (id) {
-        self.id = id;
-        web3.on(impl.changed, id, self.trigger.bind(self));
-        web3.provider.startPolling({call: impl.changed, args: [id]}, id);
-    });
-};
-
-Filter.prototype.arrived = function(callback) {
-    this.changed(callback);
-};
-
-Filter.prototype.changed = function(callback) {
-    var self = this;
-    this.promise.then(function(id) {
-        self.callbacks.push(callback);
-    });
-};
-
-Filter.prototype.trigger = function(messages) {
-    for(var i = 0; i < this.callbacks.length; i++) {
-        this.callbacks[i].call(this, messages);
-    }
-};
-
-Filter.prototype.uninstall = function() {
-    var self = this;
-    this.promise.then(function (id) {
-        self.impl.uninstallFilter(id);
-        web3.provider.stopPolling(id);
-        web3.off(impl.changed, id);
-    });
-};
-
-Filter.prototype.messages = function() {
-    var self = this;
-    return this.promise.then(function (id) {
-        return self.impl.getMessages(id);
-    });
-};
-
-function messageHandler(data) {
-    if(data._event !== undefined) {
-        web3.trigger(data._event, data._id, data.data);
-        return;
-    }
 
-    if(data._id) {
-        var cb = web3._callbacks[data._id];
-        if (cb) {
-            cb.call(this, data.data);
-            delete web3._callbacks[data._id];
+        if(data._id) {
+            var cb = web3._callbacks[data._id];
+            if (cb) {
+                cb.call(this, data.data);
+                delete web3._callbacks[data._id];
+            }
         }
     }
-}
 
-/*
-// Install default provider
-if(!web3.provider.installed()) {
-    var sock = new web3.providers.WebSocketProvider("ws://localhost:40404/eth");
-
-    web3.setProvider(sock);
-}
-*/
 
 module.exports = web3;
diff --git a/lib/qt.js b/lib/qt.js
index 145a1d52d..7ec548c8c 100644
--- a/lib/qt.js
+++ b/lib/qt.js
@@ -20,25 +20,25 @@
  * @date 2014
  */
 
-var QtProvider = function() {
-    this.handlers = [];
-
-    var self = this;
-    navigator.qt.onmessage = function (message) {
-        self.handlers.forEach(function (handler) {
-            handler.call(self, JSON.parse(message.data));
-        });
+    var QtProvider = function() {
+        this.handlers = [];
+
+        var self = this;
+        navigator.qt.onmessage = function (message) {
+            self.handlers.forEach(function (handler) {
+                handler.call(self, JSON.parse(message.data));
+            });
+        };
     };
-};
 
-QtProvider.prototype.send = function(payload) {
-    navigator.qt.postMessage(JSON.stringify(payload));
-};
+    QtProvider.prototype.send = function(payload) {
+        navigator.qt.postMessage(JSON.stringify(payload));
+    };
 
-Object.defineProperty(QtProvider.prototype, "onmessage", {
-    set: function(handler) {
-        this.handlers.push(handler);
-    }
-});
+    Object.defineProperty(QtProvider.prototype, "onmessage", {
+        set: function(handler) {
+            this.handlers.push(handler);
+        }
+    });
 
 module.exports = QtProvider;
diff --git a/lib/websocket.js b/lib/websocket.js
index 5c64d28f3..8ccb3d40b 100644
--- a/lib/websocket.js
+++ b/lib/websocket.js
@@ -24,50 +24,50 @@
 var WebSocket = require('ws'); // jshint ignore:line
 
 
-var WebSocketProvider = function(host) {
-    // onmessage handlers
-    this.handlers = [];
-    // queue will be filled with messages if send is invoked before the ws is ready
-    this.queued = [];
-    this.ready = false;
+    var WebSocketProvider = function(host) {
+        // onmessage handlers
+        this.handlers = [];
+        // queue will be filled with messages if send is invoked before the ws is ready
+        this.queued = [];
+        this.ready = false;
 
-    this.ws = new WebSocket(host);
+        this.ws = new WebSocket(host);
 
-    var self = this;
-    this.ws.onmessage = function(event) {
-        for(var i = 0; i < self.handlers.length; i++) {
-            self.handlers[i].call(self, JSON.parse(event.data), event);
-        }
-    };
+        var self = this;
+        this.ws.onmessage = function(event) {
+            for(var i = 0; i < self.handlers.length; i++) {
+                self.handlers[i].call(self, JSON.parse(event.data), event);
+            }
+        };
 
-    this.ws.onopen = function() {
-        self.ready = true;
+        this.ws.onopen = function() {
+            self.ready = true;
 
-        for(var i = 0; i < self.queued.length; i++) {
-            // Resend
-            self.send(self.queued[i]);
-        }
+            for(var i = 0; i < self.queued.length; i++) {
+                // Resend
+                self.send(self.queued[i]);
+            }
+        };
     };
-};
-WebSocketProvider.prototype.send = function(payload) {
-    if(this.ready) {
-        var data = JSON.stringify(payload);
+    WebSocketProvider.prototype.send = function(payload) {
+        if(this.ready) {
+            var data = JSON.stringify(payload);
 
-        this.ws.send(data);
-    } else {
-        this.queued.push(payload);
-    }
-};
+            this.ws.send(data);
+        } else {
+            this.queued.push(payload);
+        }
+    };
 
-WebSocketProvider.prototype.onMessage = function(handler) {
-    this.handlers.push(handler);
-};
+    WebSocketProvider.prototype.onMessage = function(handler) {
+        this.handlers.push(handler);
+    };
 
-WebSocketProvider.prototype.unload = function() {
-    this.ws.close();
-};
-Object.defineProperty(WebSocketProvider.prototype, "onmessage", {
-    set: function(provider) { this.onMessage(provider); }
-});
+    WebSocketProvider.prototype.unload = function() {
+        this.ws.close();
+    };
+    Object.defineProperty(WebSocketProvider.prototype, "onmessage", {
+        set: function(provider) { this.onMessage(provider); }
+    });
 
 module.exports = WebSocketProvider;