diff --git a/gulpfile.js b/gulpfile.js
index f8f6c96..61f7c9e 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -15,90 +15,55 @@ var unreach = require('unreachable-branch-transform');
 var source = require('vinyl-source-stream');
 var exorcist = require('exorcist');
 var bower = require('bower');
+var streamify = require('gulp-streamify');
 
 var DEST = './dist/';
+var src = 'index';
+var dst = 'ethereum';
 
-var build = function(src, dst, ugly) {
-  var result = browserify({
-      debug: true,
-      insert_global_vars: false,
-      detectGlobals: false,
-      bundleExternal: false
-    })
-    .require('./' + src + '.js', {expose: 'web3'})
-    .add('./' + src + '.js')
-    .transform('envify', {
-      NODE_ENV: 'build'
-    })
-    .transform('unreachable-branch-transform');
-
-    if (ugly) {
-      result = result.transform('uglifyify', {
-        mangle: false,
-        compress: {
-          dead_code: false,
-          conditionals: true,
-          unused: false,
-          hoist_funs: true,
-          hoist_vars: true,
-          negate_iife: false
-        },
-        beautify: true,
-        warnings: true
-      });
-    }
-
-    return result.bundle()
-    .pipe(exorcist(path.join( DEST, dst + '.js.map')))
-    .pipe(source(dst + '.js'))
-    .pipe(gulp.dest( DEST ));
-};
-
-var uglifyFile = function(file) {
-  return gulp.src( DEST + file + '.js')
-    .pipe(uglify())
-    .pipe(rename(file + '.min.js'))
-    .pipe(gulp.dest( DEST ));
+var browserifyOptions = {
+    debug: true,
+    insert_global_vars: false,
+    detectGlobals: false,
+    bundleExternal: false
 };
 
 gulp.task('bower', function(cb){
-  bower.commands.install().on('end', function (installed){
-    console.log(installed);
-    cb();
-  });
+    bower.commands.install().on('end', function (installed){
+        console.log(installed);
+        cb();
+    });
 });
 
 gulp.task('clean', ['lint'], function(cb) {
-  del([ DEST ], cb);
+    del([ DEST ], cb);
 });
 
 gulp.task('lint', function(){
-  return gulp.src(['./*.js', './lib/*.js'])
-    .pipe(jshint())
-    .pipe(jshint.reporter('default'));
+    return gulp.src(['./*.js', './lib/*.js'])
+        .pipe(jshint())
+        .pipe(jshint.reporter('default'));
 });
 
 gulp.task('build', ['clean'], function () {
-    return build('index', 'ethereum', true);
-});
-
-gulp.task('buildDev', ['clean'], function () {
-    return build('index', 'ethereum', false);
-});
-
-gulp.task('uglify', ['build'], function(){
-    return uglifyFile('ethereum');
-});
-
-gulp.task('uglifyDev', ['buildDev'], function(){
-    return uglifyFile('ethereum');
+    return browserify(browserifyOptions)
+        .require('./' + src + '.js', {expose: 'web3'})
+        .add('./' + src + '.js')
+        .transform('envify', { NODE_ENV: 'build' })
+        .transform('unreachable-branch-transform')
+        .bundle()
+        .pipe(exorcist(path.join( DEST, dst + '.js.map')))
+        .pipe(source(dst + '.js'))
+        .pipe(gulp.dest( DEST ))
+        .pipe(streamify(uglify()))
+        .pipe(rename(dst + '.min.js'))
+        .pipe(gulp.dest( DEST ));
 });
 
 gulp.task('watch', function() {
-  gulp.watch(['./lib/*.js'], ['lint', 'prepare', 'build']);
+    gulp.watch(['./lib/*.js'], ['lint', 'build']);
 });
 
-gulp.task('release', ['bower', 'lint', 'build', 'uglify']);
-gulp.task('dev', ['bower', 'lint', 'buildDev', 'uglifyDev']);
+gulp.task('dev', ['bower', 'lint', 'build']);
 gulp.task('default', ['dev']);
 
diff --git a/package.json b/package.json
index 1f866af..559e494 100644
--- a/package.json
+++ b/package.json
@@ -15,21 +15,21 @@
   "devDependencies": {
     "bower": ">=1.3.0",
     "browserify": ">=6.0",
+    "coveralls": "^2.11.2",
     "del": ">=0.1.1",
     "envify": "^3.0.0",
     "exorcist": "^0.1.6",
     "gulp": ">=3.4.0",
     "gulp-jshint": ">=1.5.0",
     "gulp-rename": ">=1.2.0",
+    "gulp-streamify": "0.0.5",
     "gulp-uglify": ">=1.0.0",
+    "istanbul": "^0.3.5",
     "jshint": ">=2.5.0",
-    "uglifyify": "^2.6.0",
-    "unreachable-branch-transform": "^0.1.0",
-    "vinyl-source-stream": "^1.0.0",
     "mocha": ">=2.1.0",
-    "coveralls": "^2.11.2",
     "mocha-lcov-reporter": "0.0.1",
-    "istanbul": "^0.3.5"
+    "unreachable-branch-transform": "^0.1.0",
+    "vinyl-source-stream": "^1.0.0"
   },
   "scripts": {
     "build": "gulp",