From 2126391e3c343573230bfea9ffac47c76ad3b91c Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Sat, 8 Oct 2016 14:28:51 +0100
Subject: [PATCH] Format using standard

---
 background.js                         |   8 +-
 ci/makeMockCompiler.js                |  60 +--
 src/app.js                            | 565 ++++++++++----------
 src/app/compiler-worker.js            |  44 +-
 src/app/compiler.js                   | 250 ++++-----
 src/app/debugger.js                   | 112 ++--
 src/app/editor.js                     | 206 ++++----
 src/app/example-contracts.js          |  66 +--
 src/app/execution-context.js          | 118 ++---
 src/app/formalVerification.js         |  38 +-
 src/app/gist-handler.js               |  32 +-
 src/app/query-params.js               |  40 +-
 src/app/renderer.js                   | 148 +++---
 src/app/storage.js                    |  98 ++--
 src/app/ui-helper.js                  | 124 ++---
 src/app/utils.js                      |  16 +-
 src/index.js                          |  10 +-
 src/lib/eventManager.js               |  32 +-
 src/universal-dapp.js                 | 714 +++++++++++++-------------
 test-browser/helpers/contracts.js     |  22 +-
 test-browser/mockcompiler/compiler.js |  24 +-
 test-browser/mockcompiler/requests.js |  64 +--
 test-browser/tests/ballot.js          |  33 +-
 test-browser/tests/debugger.js        |   6 +-
 test-browser/tests/new-file-test.js   |   6 +-
 test-browser/tests/simpleContract.js  |  22 +-
 test-browser/tests/smoke-test.js      |   6 +-
 test/compiler-test.js                 |  28 +-
 test/gist-handler-test.js             |  79 ++-
 test/index.js                         |   8 +-
 test/query-params-test.js             |  30 +-
 31 files changed, 1508 insertions(+), 1501 deletions(-)

diff --git a/background.js b/background.js
index 001d137f37..8b9269f940 100644
--- a/background.js
+++ b/background.js
@@ -1,10 +1,10 @@
 /* global chrome */
-'use strict';
+'use strict'
 
 chrome.browserAction.onClicked.addListener(function (tab) {
-  chrome.storage.sync.set({ 'chrome-app-sync': true });
+  chrome.storage.sync.set({ 'chrome-app-sync': true })
 
   chrome.tabs.create({ 'url': chrome.extension.getURL('index.html') }, function (tab) {
     // tab opened
-  });
-});
+  })
+})
diff --git a/ci/makeMockCompiler.js b/ci/makeMockCompiler.js
index a957754346..d409127b68 100644
--- a/ci/makeMockCompiler.js
+++ b/ci/makeMockCompiler.js
@@ -1,56 +1,56 @@
-var fs = require('fs');
-var solc = require('solc/wrapper');
-var soljson = require('../soljson');
-var compiler = solc(soljson);
-var inputs = require('../test-browser/mockcompiler/requests.js');
-var compilationResult = gatherCompilationResults(inputs);
-replaceSolCompiler(compilationResult);
+var fs = require('fs')
+var solc = require('solc/wrapper')
+var soljson = require('../soljson')
+var compiler = solc(soljson)
+var inputs = require('../test-browser/mockcompiler/requests.js')
+var compilationResult = gatherCompilationResults(inputs)
+replaceSolCompiler(compilationResult)
 
 function gatherCompilationResults (sol) {
-  var compilationResult = {};
+  var compilationResult = {}
   for (var k in sol) {
-    var item = sol[k];
-    var result = compile(item, 1);
-    compilationResult[result.key] = result;
-    result = compile(item, 0);
-    compilationResult[result.key] = result;
+    var item = sol[k]
+    var result = compile(item, 1)
+    compilationResult[result.key] = result
+    result = compile(item, 0)
+    compilationResult[result.key] = result
   }
-  return compilationResult;
+  return compilationResult
 }
 
 function compile (source, optimization) {
-  var missingInputs = [];
+  var missingInputs = []
   var result = compiler.compile(source, optimization, function (path) {
-    missingInputs.push(path);
-  });
-  var key = optimization.toString();
+    missingInputs.push(path)
+  })
+  var key = optimization.toString()
   for (var k in source.sources) {
-    key += k + source.sources[k];
+    key += k + source.sources[k]
   }
-  key = key.replace(/(\t)|(\n)|( )/g, '');
+  key = key.replace(/(\t)|(\n)|( )/g, '')
   return {
     key: key,
     source: source,
     optimization: optimization,
     missingInputs: missingInputs,
     result: result
-  };
+  }
 }
 
 function replaceSolCompiler (results) {
   fs.readFile('./test-browser/mockcompiler/compiler.js', 'utf8', function (error, data) {
     if (error) {
-      console.log(error);
-      process.exit(1);
-      return;
+      console.log(error)
+      process.exit(1)
+      return
     }
-    data = data + '\n\nvar mockData = ' + JSON.stringify(results) + ';\n';
+    data = data + '\n\nvar mockData = ' + JSON.stringify(results) + ';\n'
     fs.writeFile('./soljson.js', data, 'utf8', function (error) {
       if (error) {
-        console.log(error);
-        process.exit(1);
-        return;
+        console.log(error)
+        process.exit(1)
+        return
       }
-    });
-  });
+    })
+  })
 }
diff --git a/src/app.js b/src/app.js
index 0188203cdb..8fab4021ee 100644
--- a/src/app.js
+++ b/src/app.js
@@ -1,63 +1,66 @@
 /* global alert, confirm, prompt, Option, Worker */
-'use strict';
-
-var $ = require('jquery');
-var base64 = require('js-base64').Base64;
-
-var utils = require('./app/utils');
-var QueryParams = require('./app/query-params');
-var queryParams = new QueryParams();
-var GistHandler = require('./app/gist-handler');
-var gistHandler = new GistHandler();
-
-var Storage = require('./app/storage');
-var Editor = require('./app/editor');
-var Renderer = require('./app/renderer');
-var Compiler = require('./app/compiler');
-var ExecutionContext = require('./app/execution-context');
-var UniversalDApp = require('./universal-dapp.js');
-var Debugger = require('./app/debugger');
-var FormalVerification = require('./app/formalVerification');
-var EventManager = require('./lib/eventManager');
+'use strict'
+
+var $ = require('jquery')
+var base64 = require('js-base64').Base64
+
+var utils = require('./app/utils')
+var QueryParams = require('./app/query-params')
+var queryParams = new QueryParams()
+var GistHandler = require('./app/gist-handler')
+var gistHandler = new GistHandler()
+
+var Storage = require('./app/storage')
+var Editor = require('./app/editor')
+var Renderer = require('./app/renderer')
+var Compiler = require('./app/compiler')
+var ExecutionContext = require('./app/execution-context')
+var UniversalDApp = require('./universal-dapp.js')
+var Debugger = require('./app/debugger')
+var FormalVerification = require('./app/formalVerification')
+var EventManager = require('./lib/eventManager')
+
 // The event listener needs to be registered as early as possible, because the
 // parent will send the message upon the "load" event.
-var filesToLoad = null;
-var loadFilesCallback = function (files) { filesToLoad = files; }; // will be replaced later
+var filesToLoad = null
+var loadFilesCallback = function (files) { filesToLoad = files } // will be replaced later
+
 window.addEventListener('message', function (ev) {
   if (typeof ev.data === typeof [] && ev.data[0] === 'loadFiles') {
-    loadFilesCallback(ev.data[1]);
+    loadFilesCallback(ev.data[1])
   }
-}, false);
+}, false)
+
 /*
   trigger tabChanged
 */
 var run = function () {
-  var self = this;
-  this.event = new EventManager();
-  var storage = new Storage(updateFiles);
+  var self = this
+  this.event = new EventManager()
+  var storage = new Storage(updateFiles)
 
   function loadFiles (files) {
     for (var f in files) {
-      var key = utils.fileKey(f);
-      var content = files[f].content;
-      storage.loadFile(key, content);
+      var key = utils.fileKey(f)
+      var content = files[f].content
+      storage.loadFile(key, content)
     }
-    editor.setCacheFile(utils.fileKey(Object.keys(files)[0]));
-    updateFiles();
+    editor.setCacheFile(utils.fileKey(Object.keys(files)[0]))
+    updateFiles()
   }
 
   loadFilesCallback = function (files) {
-    loadFiles(files);
-  };
+    loadFiles(files)
+  }
 
   if (filesToLoad !== null) {
-    loadFiles(filesToLoad);
+    loadFiles(filesToLoad)
   }
 
   // -------- check file upload capabilities -------
 
   if (!(window.File || window.FileReader || window.FileList || window.Blob)) {
-    $('.uploadFile').remove();
+    $('.uploadFile').remove()
   }
 
   // ------------------ gist load ----------------
@@ -70,47 +73,47 @@ var run = function () {
       success: function (response) {
         if (response.data) {
           if (!response.data.files) {
-            alert('Gist load error: ' + response.data.message);
-            return;
+            alert('Gist load error: ' + response.data.message)
+            return
           }
-          loadFiles(response.data.files);
+          loadFiles(response.data.files)
         }
       }
-    });
-  });
+    })
+  })
 
   // ----------------- storage sync --------------------
 
-  window.syncStorage = storage.sync;
-  storage.sync();
+  window.syncStorage = storage.sync
+  storage.sync()
 
   // ----------------- editor ----------------------
 
-  var editor = new Editor(loadingFromGist, storage);
+  var editor = new Editor(loadingFromGist, storage)
 
   // ----------------- tabbed menu -------------------
   $('#options li').click(function (ev) {
-    var $el = $(this);
-    selectTab($el);
-  });
+    var $el = $(this)
+    selectTab($el)
+  })
   var selectTab = function (el) {
-    var match = /[a-z]+View/.exec(el.get(0).className);
-    if (!match) return;
-    var cls = match[0];
+    var match = /[a-z]+View/.exec(el.get(0).className)
+    if (!match) return
+    var cls = match[0]
     if (!el.hasClass('active')) {
-      el.parent().find('li').removeClass('active');
-      $('#optionViews').attr('class', '').addClass(cls);
-      el.addClass('active');
+      el.parent().find('li').removeClass('active')
+      $('#optionViews').attr('class', '').addClass(cls)
+      el.addClass('active')
     }
-    self.event.trigger('tabChanged', [cls]);
-  };
+    self.event.trigger('tabChanged', [cls])
+  }
 
   // ------------------ gist publish --------------
 
   $('#gist').click(function () {
     if (confirm('Are you sure you want to publish all your files anonymously as a public gist on github.com?')) {
-      var files = editor.packageFiles();
-      var description = 'Created using browser-solidity: Realtime Ethereum Contract Compiler and Runtime. \n Load this file by pasting this gists URL or ID at https://ethereum.github.io/browser-solidity/#version=' + queryParams.get().version + '&optimize=' + queryParams.get().optimize + '&gist=';
+      var files = editor.packageFiles()
+      var description = 'Created using browser-solidity: Realtime Ethereum Contract Compiler and Runtime. \n Load this file by pasting this gists URL or ID at https://ethereum.github.io/browser-solidity/#version=' + queryParams.get().version + '&optimize=' + queryParams.get().optimize + '&gist='
 
       $.ajax({
         url: 'https://api.github.com/gists',
@@ -122,159 +125,161 @@ var run = function () {
         })
       }).done(function (response) {
         if (response.html_url && confirm('Created a gist at ' + response.html_url + ' Would you like to open it in a new window?')) {
-          window.open(response.html_url, '_blank');
+          window.open(response.html_url, '_blank')
         }
-      });
+      })
     }
-  });
+  })
 
   $('#copyOver').click(function () {
     var target = prompt(
       'To which other browser-solidity instance do you want to copy over all files?',
       'https://ethereum.github.io/browser-solidity/'
-    );
+    )
     if (target === null) {
-      return;
+      return
     }
-    var files = editor.packageFiles();
-    $('<iframe/>', {src: target, style: 'display:none;', load: function () {
-      this.contentWindow.postMessage(['loadFiles', files], '*');
-    }}).appendTo('body');
-  });
+    var files = editor.packageFiles()
+    $('<iframe/>', {
+      src: target,
+      style: 'display:none;',
+      load: function () { this.contentWindow.postMessage(['loadFiles', files], '*') }
+    }).appendTo('body')
+  })
 
   // ----------------- file selector-------------
 
-  var $filesEl = $('#files');
-  var FILE_SCROLL_DELTA = 300;
+  var $filesEl = $('#files')
+  var FILE_SCROLL_DELTA = 300
 
   $('.newFile').on('click', function () {
-    editor.newFile();
-    updateFiles();
+    editor.newFile()
+    updateFiles()
 
     $filesEl.animate({ left: Math.max((0 - activeFilePos() + (FILE_SCROLL_DELTA / 2)), 0) + 'px' }, 'slow', function () {
-      reAdjust();
-    });
-  });
+      reAdjust()
+    })
+  })
 
   // ----------------- file upload -------------
 
   $('.inputFile').on('change', function () {
-    var fileList = $('input.inputFile')[0].files;
+    var fileList = $('input.inputFile')[0].files
     for (var i = 0; i < fileList.length; i++) {
-      var name = fileList[i].name;
+      var name = fileList[i].name
       if (!storage.exists(utils.fileKey(name)) || confirm('The file ' + name + ' already exists! Would you like to overwrite it?')) {
-        editor.uploadFile(fileList[i], updateFiles);
+        editor.uploadFile(fileList[i], updateFiles)
       }
     }
 
     $filesEl.animate({ left: Math.max((0 - activeFilePos() + (FILE_SCROLL_DELTA / 2)), 0) + 'px' }, 'slow', function () {
-      reAdjust();
-    });
-  });
+      reAdjust()
+    })
+  })
 
-  $filesEl.on('click', '.file:not(.active)', showFileHandler);
+  $filesEl.on('click', '.file:not(.active)', showFileHandler)
 
   $filesEl.on('click', '.file.active', function (ev) {
-    var $fileTabEl = $(this);
-    var originalName = $fileTabEl.find('.name').text();
-    ev.preventDefault();
-    if ($(this).find('input').length > 0) return false;
-    var $fileNameInputEl = $('<input value="' + originalName + '"/>');
-    $fileTabEl.html($fileNameInputEl);
-    $fileNameInputEl.focus();
-    $fileNameInputEl.select();
-    $fileNameInputEl.on('blur', handleRename);
-    $fileNameInputEl.keyup(handleRename);
+    var $fileTabEl = $(this)
+    var originalName = $fileTabEl.find('.name').text()
+    ev.preventDefault()
+    if ($(this).find('input').length > 0) return false
+    var $fileNameInputEl = $('<input value="' + originalName + '"/>')
+    $fileTabEl.html($fileNameInputEl)
+    $fileNameInputEl.focus()
+    $fileNameInputEl.select()
+    $fileNameInputEl.on('blur', handleRename)
+    $fileNameInputEl.keyup(handleRename)
 
     function handleRename (ev) {
-      ev.preventDefault();
-      if (ev.which && ev.which !== 13) return false;
-      var newName = ev.target.value;
-      $fileNameInputEl.off('blur');
-      $fileNameInputEl.off('keyup');
+      ev.preventDefault()
+      if (ev.which && ev.which !== 13) return false
+      var newName = ev.target.value
+      $fileNameInputEl.off('blur')
+      $fileNameInputEl.off('keyup')
 
       if (newName !== originalName && confirm(
           storage.exists(utils.fileKey(newName))
             ? 'Are you sure you want to overwrite: ' + newName + ' with ' + originalName + '?'
             : 'Are you sure you want to rename: ' + originalName + ' to ' + newName + '?')) {
-        storage.rename(utils.fileKey(originalName), utils.fileKey(newName));
-        editor.renameSession(utils.fileKey(originalName), utils.fileKey(newName));
-        editor.setCacheFile(utils.fileKey(newName));
+        storage.rename(utils.fileKey(originalName), utils.fileKey(newName))
+        editor.renameSession(utils.fileKey(originalName), utils.fileKey(newName))
+        editor.setCacheFile(utils.fileKey(newName))
       }
 
-      updateFiles();
-      return false;
+      updateFiles()
+      return false
     }
 
-    return false;
-  });
+    return false
+  })
 
   $filesEl.on('click', '.file .remove', function (ev) {
-    ev.preventDefault();
-    var name = $(this).parent().find('.name').text();
+    ev.preventDefault()
+    var name = $(this).parent().find('.name').text()
 
     if (confirm('Are you sure you want to remove: ' + name + ' from local storage?')) {
-      storage.remove(utils.fileKey(name));
-      editor.removeSession(utils.fileKey(name));
-      editor.setNextFile(utils.fileKey(name));
-      updateFiles();
+      storage.remove(utils.fileKey(name))
+      editor.removeSession(utils.fileKey(name))
+      editor.setNextFile(utils.fileKey(name))
+      updateFiles()
     }
-    return false;
-  });
+    return false
+  })
 
   function swicthToFile (file) {
-    editor.setCacheFile(utils.fileKey(file));
-    updateFiles();
+    editor.setCacheFile(utils.fileKey(file))
+    updateFiles()
   }
 
   function showFileHandler (ev) {
-    ev.preventDefault();
-    swicthToFile($(this).find('.name').text());
-    return false;
+    ev.preventDefault()
+    swicthToFile($(this).find('.name').text())
+    return false
   }
 
   function activeFileTab () {
-    var name = utils.fileNameFromKey(editor.getCacheFile());
-    return $('#files .file').filter(function () { return $(this).find('.name').text() === name; });
+    var name = utils.fileNameFromKey(editor.getCacheFile())
+    return $('#files .file').filter(function () { return $(this).find('.name').text() === name })
   }
 
   function updateFiles () {
-    var $filesEl = $('#files');
-    var files = editor.getFiles();
+    var $filesEl = $('#files')
+    var files = editor.getFiles()
 
-    $filesEl.find('.file').remove();
-    $('#output').empty();
+    $filesEl.find('.file').remove()
+    $('#output').empty()
 
     for (var f in files) {
-      $filesEl.append(fileTabTemplate(files[f]));
+      $filesEl.append(fileTabTemplate(files[f]))
     }
 
     if (editor.cacheFileIsPresent()) {
-      var active = activeFileTab();
-      active.addClass('active');
-      editor.resetSession();
+      var active = activeFileTab()
+      active.addClass('active')
+      editor.resetSession()
     }
-    $('#input').toggle(editor.cacheFileIsPresent());
-    $('#output').toggle(editor.cacheFileIsPresent());
-    reAdjust();
+    $('#input').toggle(editor.cacheFileIsPresent())
+    $('#output').toggle(editor.cacheFileIsPresent())
+    reAdjust()
   }
 
   function fileTabTemplate (key) {
-    var name = utils.fileNameFromKey(key);
-    return $('<li class="file"><span class="name">' + name + '</span><span class="remove"><i class="fa fa-close"></i></span></li>');
+    var name = utils.fileNameFromKey(key)
+    return $('<li class="file"><span class="name">' + name + '</span><span class="remove"><i class="fa fa-close"></i></span></li>')
   }
 
-  var $filesWrapper = $('.files-wrapper');
-  var $scrollerRight = $('.scroller-right');
-  var $scrollerLeft = $('.scroller-left');
+  var $filesWrapper = $('.files-wrapper')
+  var $scrollerRight = $('.scroller-right')
+  var $scrollerLeft = $('.scroller-left')
 
   function widthOfList () {
-    var itemsWidth = 0;
+    var itemsWidth = 0
     $('.file').each(function () {
-      var itemWidth = $(this).outerWidth();
-      itemsWidth += itemWidth;
-    });
-    return itemsWidth;
+      var itemWidth = $(this).outerWidth()
+      itemsWidth += itemWidth
+    })
+    return itemsWidth
   }
 
   //  function widthOfHidden () {
@@ -282,321 +287,321 @@ var run = function () {
   //  }
 
   function widthOfVisible () {
-    return $filesWrapper.outerWidth();
+    return $filesWrapper.outerWidth()
   }
 
   function getLeftPosi () {
-    return $filesEl.position().left;
+    return $filesEl.position().left
   }
 
   function activeFilePos () {
-    var el = $filesEl.find('.active');
-    var l = el.position().left;
-    return l;
+    var el = $filesEl.find('.active')
+    var l = el.position().left
+    return l
   }
 
   function reAdjust () {
     if (widthOfList() + getLeftPosi() > widthOfVisible()) {
-      $scrollerRight.fadeIn('fast');
+      $scrollerRight.fadeIn('fast')
     } else {
-      $scrollerRight.fadeOut('fast');
+      $scrollerRight.fadeOut('fast')
     }
 
     if (getLeftPosi() < 0) {
-      $scrollerLeft.fadeIn('fast');
+      $scrollerLeft.fadeIn('fast')
     } else {
-      $scrollerLeft.fadeOut('fast');
-      $filesEl.animate({ left: getLeftPosi() + 'px' }, 'slow');
+      $scrollerLeft.fadeOut('fast')
+      $filesEl.animate({ left: getLeftPosi() + 'px' }, 'slow')
     }
   }
 
   $scrollerRight.click(function () {
-    var delta = (getLeftPosi() - FILE_SCROLL_DELTA);
+    var delta = (getLeftPosi() - FILE_SCROLL_DELTA)
     $filesEl.animate({ left: delta + 'px' }, 'slow', function () {
-      reAdjust();
-    });
-  });
+      reAdjust()
+    })
+  })
 
   $scrollerLeft.click(function () {
-    var delta = Math.min((getLeftPosi() + FILE_SCROLL_DELTA), 0);
+    var delta = Math.min((getLeftPosi() + FILE_SCROLL_DELTA), 0)
     $filesEl.animate({ left: delta + 'px' }, 'slow', function () {
-      reAdjust();
-    });
-  });
+      reAdjust()
+    })
+  })
 
-  updateFiles();
+  updateFiles()
 
   // ----------------- resizeable ui ---------------
 
-  var dragging = false;
+  var dragging = false
   $('#dragbar').mousedown(function (e) {
-    e.preventDefault();
-    dragging = true;
-    var main = $('#righthand-panel');
+    e.preventDefault()
+    dragging = true
+    var main = $('#righthand-panel')
     var ghostbar = $('<div id="ghostbar">', {
       css: {
         top: main.offset().top,
         left: main.offset().left
       }
-    }).prependTo('body');
+    }).prependTo('body')
 
     $(document).mousemove(function (e) {
-      ghostbar.css('left', e.pageX + 2);
-    });
-  });
+      ghostbar.css('left', e.pageX + 2)
+    })
+  })
 
-  var $body = $('body');
+  var $body = $('body')
 
   function setEditorSize (delta) {
-    $('#righthand-panel').css('width', delta);
-    $('#editor').css('right', delta);
-    onResize();
+    $('#righthand-panel').css('width', delta)
+    $('#editor').css('right', delta)
+    onResize()
   }
 
   function getEditorSize () {
-    storage.setEditorSize($('#righthand-panel').width());
+    storage.setEditorSize($('#righthand-panel').width())
   }
 
   $(document).mouseup(function (e) {
     if (dragging) {
-      var delta = $body.width() - e.pageX + 2;
-      $('#ghostbar').remove();
-      $(document).unbind('mousemove');
-      dragging = false;
-      setEditorSize(delta);
-      storage.setEditorSize(delta);
-      reAdjust();
+      var delta = $body.width() - e.pageX + 2
+      $('#ghostbar').remove()
+      $(document).unbind('mousemove')
+      dragging = false
+      setEditorSize(delta)
+      storage.setEditorSize(delta)
+      reAdjust()
     }
-  });
+  })
 
   // set cached defaults
-  var cachedSize = storage.getEditorSize();
-  if (cachedSize) setEditorSize(cachedSize);
-  else getEditorSize();
+  var cachedSize = storage.getEditorSize()
+  if (cachedSize) setEditorSize(cachedSize)
+  else getEditorSize()
 
   // ----------------- toggle right hand panel -----------------
 
-  var hidingRHP = false;
+  var hidingRHP = false
   $('.toggleRHP').click(function () {
-    hidingRHP = !hidingRHP;
-    setEditorSize(hidingRHP ? 0 : storage.getEditorSize());
-    $('.toggleRHP i').toggleClass('fa-angle-double-right', !hidingRHP);
-    $('.toggleRHP i').toggleClass('fa-angle-double-left', hidingRHP);
-  });
+    hidingRHP = !hidingRHP
+    setEditorSize(hidingRHP ? 0 : storage.getEditorSize())
+    $('.toggleRHP i').toggleClass('fa-angle-double-right', !hidingRHP)
+    $('.toggleRHP i').toggleClass('fa-angle-double-left', hidingRHP)
+  })
 
   // ----------------- editor resize ---------------
 
   function onResize () {
-    editor.resize();
-    reAdjust();
+    editor.resize()
+    reAdjust()
   }
-  window.onresize = onResize;
-  onResize();
+  window.onresize = onResize
+  onResize()
 
-  document.querySelector('#editor').addEventListener('change', onResize);
-  document.querySelector('#editorWrap').addEventListener('change', onResize);
+  document.querySelector('#editor').addEventListener('change', onResize)
+  document.querySelector('#editorWrap').addEventListener('change', onResize)
 
   // ----------------- compiler output renderer ----------------------
 
-  $('.asmOutput button').click(function () { $(this).parent().find('pre').toggle(); });
+  $('.asmOutput button').click(function () { $(this).parent().find('pre').toggle() })
 
   // ----------------- compiler ----------------------
 
   function handleGithubCall (root, path, cb) {
-    $('#output').append($('<div/>').append($('<pre/>').text('Loading github.com/' + root + '/' + path + ' ...')));
+    $('#output').append($('<div/>').append($('<pre/>').text('Loading github.com/' + root + '/' + path + ' ...')))
     return $.getJSON('https://api.github.com/repos/' + root + '/contents/' + path)
       .done(function (data) {
         if ('content' in data) {
-          cb(null, base64.decode(data.content));
+          cb(null, base64.decode(data.content))
         } else {
-          cb('Content not received');
+          cb('Content not received')
         }
       })
       .fail(function (xhr, text, err) {
         // NOTE: on some browsers, err equals to '' for certain errors (such as offline browser)
-        cb(err || 'Unknown transport error');
-      });
+        cb(err || 'Unknown transport error')
+      })
   }
 
-  var executionContext = new ExecutionContext();
-  var compiler = new Compiler(editor, handleGithubCall);
-  var formalVerification = new FormalVerification($('#verificationView'), compiler.event);
+  var executionContext = new ExecutionContext()
+  var compiler = new Compiler(editor, handleGithubCall)
+  var formalVerification = new FormalVerification($('#verificationView'), compiler.event)
 
-  var transactionDebugger = new Debugger('#debugger', editor, compiler, executionContext.event, swicthToFile);
-  transactionDebugger.addProvider('vm', executionContext.vm());
-  transactionDebugger.switchProvider('vm');
-  transactionDebugger.addProvider('injected', executionContext.web3());
-  transactionDebugger.addProvider('web3', executionContext.web3());
+  var transactionDebugger = new Debugger('#debugger', editor, compiler, executionContext.event, swicthToFile)
+  transactionDebugger.addProvider('vm', executionContext.vm())
+  transactionDebugger.switchProvider('vm')
+  transactionDebugger.addProvider('injected', executionContext.web3())
+  transactionDebugger.addProvider('web3', executionContext.web3())
 
   var udapp = new UniversalDApp(executionContext, {
     removable: false,
     removable_instances: true
-  }, transactionDebugger);
+  }, transactionDebugger)
 
   udapp.event.register('debugRequested', this, function (txResult) {
-    startdebugging(txResult.transactionHash);
-  });
+    startdebugging(txResult.transactionHash)
+  })
 
-  var renderer = new Renderer(editor, executionContext.web3(), updateFiles, udapp, executionContext, formalVerification.event, compiler.event); // eslint-disable-line
+  var renderer = new Renderer(editor, executionContext.web3(), updateFiles, udapp, executionContext, formalVerification.event, compiler.event) // eslint-disable-line
 
-  var autoCompile = document.querySelector('#autoCompile').checked;
+  var autoCompile = document.querySelector('#autoCompile').checked
 
   document.querySelector('#autoCompile').addEventListener('change', function () {
-    autoCompile = document.querySelector('#autoCompile').checked;
-  });
+    autoCompile = document.querySelector('#autoCompile').checked
+  })
 
-  var previousInput = '';
-  var compileTimeout = null;
+  var previousInput = ''
+  var compileTimeout = null
 
   function editorOnChange () {
-    var input = editor.getValue();
+    var input = editor.getValue()
     if (input === '') {
-      editor.setCacheFileContent('');
-      return;
+      editor.setCacheFileContent('')
+      return
     }
     if (input === previousInput) {
-      return;
+      return
     }
-    previousInput = input;
+    previousInput = input
 
     if (!autoCompile) {
-      return;
+      return
     }
 
     if (compileTimeout) {
-      window.clearTimeout(compileTimeout);
+      window.clearTimeout(compileTimeout)
     }
-    compileTimeout = window.setTimeout(compiler.compile, 300);
+    compileTimeout = window.setTimeout(compiler.compile, 300)
   }
 
-  editor.onChangeSetup(editorOnChange);
+  editor.onChangeSetup(editorOnChange)
 
   $('#compile').click(function () {
-    compiler.compile();
-  });
+    compiler.compile()
+  })
 
   executionContext.event.register('contextChanged', this, function (context) {
-    compiler.compile();
-  });
+    compiler.compile()
+  })
 
   executionContext.event.register('web3EndpointChanged', this, function (context) {
-    compiler.compile();
-  });
+    compiler.compile()
+  })
 
   compiler.event.register('loadingCompiler', this, function (url, usingWorker) {
-    setVersionText(usingWorker ? '(loading using worker)' : '(loading)');
-  });
+    setVersionText(usingWorker ? '(loading using worker)' : '(loading)')
+  })
 
   compiler.event.register('compilerLoaded', this, function (version) {
-    previousInput = '';
-    setVersionText(version);
-    compiler.compile();
+    previousInput = ''
+    setVersionText(version)
+    compiler.compile()
 
     if (queryParams.get().endpointurl) {
-      executionContext.setEndPointUrl(queryParams.get().endpointurl);
+      executionContext.setEndPointUrl(queryParams.get().endpointurl)
     }
     if (queryParams.get().context) {
-      executionContext.setContext(queryParams.get().context);
+      executionContext.setContext(queryParams.get().context)
     }
     if (queryParams.get().debugtx) {
-      startdebugging(queryParams.get().debugtx);
+      startdebugging(queryParams.get().debugtx)
     }
-  });
+  })
 
   function startdebugging (txHash) {
-    transactionDebugger.debug(txHash);
-    selectTab($('ul#options li.debugView'));
+    transactionDebugger.debug(txHash)
+    selectTab($('ul#options li.debugView'))
   }
 
   function setVersionText (text) {
-    $('#version').text(text);
+    $('#version').text(text)
   }
 
   function loadVersion (version) {
-    queryParams.update({ version: version });
-    var url;
+    queryParams.update({ version: version })
+    var url
     if (version === 'builtin') {
-      var location = window.document.location;
-      location = location.protocol + '//' + location.host + '/' + location.pathname;
+      var location = window.document.location
+      location = location.protocol + '//' + location.host + '/' + location.pathname
       if (!location.endsWith('/')) {
-        location += '/';
+        location += '/'
       }
 
-      url = location + 'soljson.js';
+      url = location + 'soljson.js'
     } else {
-      url = 'https://ethereum.github.io/solc-bin/bin/' + version;
+      url = 'https://ethereum.github.io/solc-bin/bin/' + version
     }
-    var isFirefox = typeof InstallTrigger !== 'undefined';
+    var isFirefox = typeof InstallTrigger !== 'undefined'
     if (document.location.protocol !== 'file:' && Worker !== undefined && isFirefox) {
       // Workers cannot load js on "file:"-URLs and we get a
       // "Uncaught RangeError: Maximum call stack size exceeded" error on Chromium,
       // resort to non-worker version in that case.
-      compiler.loadVersion(true, url);
+      compiler.loadVersion(true, url)
     } else {
-      compiler.loadVersion(false, url);
+      compiler.loadVersion(false, url)
     }
   }
 
   // set default
-  $('#optimize').attr('checked', (queryParams.get().optimize === 'true'));
-  compiler.setOptimize(document.querySelector('#optimize').checked);
+  $('#optimize').attr('checked', (queryParams.get().optimize === 'true'))
+  compiler.setOptimize(document.querySelector('#optimize').checked)
 
   document.querySelector('#optimize').addEventListener('change', function () {
-    var optimize = document.querySelector('#optimize').checked;
-    queryParams.update({ optimize: optimize });
-    compiler.setOptimize(optimize);
-    compiler.compile();
-  });
+    var optimize = document.querySelector('#optimize').checked
+    queryParams.update({ optimize: optimize })
+    compiler.setOptimize(optimize)
+    compiler.compile()
+  })
 
   // ----------------- version selector-------------
 
   // clear and disable the version selector
-  $('option', '#versionSelector').remove();
-  $('#versionSelector').attr('disabled', true);
+  $('option', '#versionSelector').remove()
+  $('#versionSelector').attr('disabled', true)
 
   // load the new version upon change
   $('#versionSelector').change(function () {
-    loadVersion($('#versionSelector').val());
-  });
+    loadVersion($('#versionSelector').val())
+  })
 
   $.getJSON('https://ethereum.github.io/solc-bin/bin/list.json').done(function (data) {
     function buildVersion (build) {
       if (build.prerelease && build.prerelease.length > 0) {
-        return build.version + '-' + build.prerelease;
+        return build.version + '-' + build.prerelease
       } else {
-        return build.version;
+        return build.version
       }
     }
 
     // populate version dropdown with all available compiler versions (descending order)
     $.each(data.builds.slice().reverse(), function (i, build) {
-      $('#versionSelector').append(new Option(buildVersion(build), build.path));
-    });
+      $('#versionSelector').append(new Option(buildVersion(build), build.path))
+    })
 
-    $('#versionSelector').attr('disabled', false);
+    $('#versionSelector').attr('disabled', false)
 
     // always include the local version
-    $('#versionSelector').append(new Option('latest local version', 'builtin'));
+    $('#versionSelector').append(new Option('latest local version', 'builtin'))
 
     // find latest release
-    var selectedVersion = data.releases[data.latestRelease];
+    var selectedVersion = data.releases[data.latestRelease]
 
     // override with the requested version
     if (queryParams.get().version) {
-      selectedVersion = queryParams.get().version;
+      selectedVersion = queryParams.get().version
     }
 
-    loadVersion(selectedVersion);
+    loadVersion(selectedVersion)
   }).fail(function (xhr, text, err) {
     // loading failed for some reason, fall back to local compiler
-    $('#versionSelector').append(new Option('latest local version', 'builtin'));
+    $('#versionSelector').append(new Option('latest local version', 'builtin'))
 
-    loadVersion('builtin');
-  });
+    loadVersion('builtin')
+  })
 
-  storage.sync();
-};
+  storage.sync()
+}
 
 module.exports = {
   'run': run
-};
+}
diff --git a/src/app/compiler-worker.js b/src/app/compiler-worker.js
index b0f6dc0a86..0b8630fe04 100644
--- a/src/app/compiler-worker.js
+++ b/src/app/compiler-worker.js
@@ -1,46 +1,46 @@
-'use strict';
+'use strict'
 
-var solc = require('solc/wrapper');
+var solc = require('solc/wrapper')
 
-var compileJSON = function () { return ''; };
-var missingInputs = [];
+var compileJSON = function () { return '' }
+var missingInputs = []
 
 module.exports = function (self) {
   self.addEventListener('message', function (e) {
-    var data = e.data;
+    var data = e.data
     switch (data.cmd) {
       case 'loadVersion':
-        delete self.Module;
+        delete self.Module
         // NOTE: workaround some browsers?
-        self.Module = undefined;
+        self.Module = undefined
 
-        compileJSON = null;
+        compileJSON = null
 
-        self.importScripts(data.data);
+        self.importScripts(data.data)
 
-        var compiler = solc(self.Module);
+        var compiler = solc(self.Module)
 
         compileJSON = function (input, optimize) {
           try {
             return JSON.stringify(compiler.compile(JSON.parse(input), optimize, function (path) {
-              missingInputs.push(path);
-              return { 'error': 'Deferred import' };
-            }));
+              missingInputs.push(path)
+              return { 'error': 'Deferred import' }
+            }))
           } catch (exception) {
-            return JSON.stringify({ error: 'Uncaught JavaScript exception:\n' + exception });
+            return JSON.stringify({ error: 'Uncaught JavaScript exception:\n' + exception })
           }
-        };
+        }
 
         self.postMessage({
           cmd: 'versionLoaded',
           data: compiler.version(),
           acceptsMultipleFiles: compiler.supportsMulti
-        });
-        break;
+        })
+        break
       case 'compile':
-        missingInputs.length = 0;
-        self.postMessage({cmd: 'compiled', job: data.job, data: compileJSON(data.source, data.optimize), missingInputs: missingInputs});
-        break;
+        missingInputs.length = 0
+        self.postMessage({cmd: 'compiled', job: data.job, data: compileJSON(data.source, data.optimize), missingInputs: missingInputs})
+        break
     }
-  }, false);
-};
+  }, false)
+}
diff --git a/src/app/compiler.js b/src/app/compiler.js
index ad1a99a383..e4bd76520a 100644
--- a/src/app/compiler.js
+++ b/src/app/compiler.js
@@ -1,265 +1,265 @@
-'use strict';
+'use strict'
 
-var solc = require('solc/wrapper');
+var solc = require('solc/wrapper')
 
-var webworkify = require('webworkify');
-var utils = require('./utils');
+var webworkify = require('webworkify')
+var utils = require('./utils')
 
-var EventManager = require('../lib/eventManager');
+var EventManager = require('../lib/eventManager')
 
 /*
   trigger compilationFinished, compilerLoaded, compilationStarted
 */
 function Compiler (editor, handleGithubCall) {
-  var self = this;
-  this.event = new EventManager();
+  var self = this
+  this.event = new EventManager()
 
-  var compileJSON;
-  var compilerAcceptsMultipleFiles;
+  var compileJSON
+  var compilerAcceptsMultipleFiles
 
-  var cachedRemoteFiles = {};
-  var worker = null;
+  var cachedRemoteFiles = {}
+  var worker = null
 
-  var optimize = false;
+  var optimize = false
 
   this.setOptimize = function (_optimize) {
-    optimize = _optimize;
-  };
+    optimize = _optimize
+  }
 
   var compile = function (missingInputs) {
-    editor.clearAnnotations();
-    self.event.trigger('compilationStarted', []);
-    var input = editor.getValue();
-    editor.setCacheFileContent(input);
+    editor.clearAnnotations()
+    self.event.trigger('compilationStarted', [])
+    var input = editor.getValue()
+    editor.setCacheFileContent(input)
 
-    var files = {};
-    files[utils.fileNameFromKey(editor.getCacheFile())] = input;
+    var files = {}
+    files[utils.fileNameFromKey(editor.getCacheFile())] = input
     gatherImports(files, missingInputs, function (input, error) {
       if (input === null) {
-        self.lastCompilationResult = null;
-        self.event.trigger('compilationFinished', [false, { 'error': error }, files]);
+        self.lastCompilationResult = null
+        self.event.trigger('compilationFinished', [false, { 'error': error }, files])
       } else {
-        compileJSON(input, optimize ? 1 : 0);
+        compileJSON(input, optimize ? 1 : 0)
       }
-    });
-  };
-  this.compile = compile;
+    })
+  }
+  this.compile = compile
 
   function setCompileJSON (_compileJSON) {
-    compileJSON = _compileJSON;
+    compileJSON = _compileJSON
   }
-  this.setCompileJSON = setCompileJSON; // this is exposed for testing
+  this.setCompileJSON = setCompileJSON // this is exposed for testing
 
   function onCompilerLoaded (version) {
-    self.event.trigger('compilerLoaded', [version]);
+    self.event.trigger('compilerLoaded', [version])
   }
 
   function onInternalCompilerLoaded () {
     if (worker === null) {
-      var compiler = solc(window.Module);
+      var compiler = solc(window.Module)
 
-      compilerAcceptsMultipleFiles = compiler.supportsMulti;
+      compilerAcceptsMultipleFiles = compiler.supportsMulti
 
       compileJSON = function (source, optimize, cb) {
-        var missingInputs = [];
+        var missingInputs = []
         var missingInputsCallback = function (path) {
-          missingInputs.push(path);
-          return { error: 'Deferred import' };
-        };
+          missingInputs.push(path)
+          return { error: 'Deferred import' }
+        }
 
-        var result;
+        var result
         try {
-          result = compiler.compile(source, optimize, missingInputsCallback);
+          result = compiler.compile(source, optimize, missingInputsCallback)
         } catch (exception) {
-          result = { error: 'Uncaught JavaScript exception:\n' + exception };
+          result = { error: 'Uncaught JavaScript exception:\n' + exception }
         }
 
-        compilationFinished(result, missingInputs, source);
-      };
+        compilationFinished(result, missingInputs, source)
+      }
 
-      onCompilerLoaded(compiler.version());
+      onCompilerLoaded(compiler.version())
     }
   }
 
   this.lastCompilationResult = {
     data: null,
     source: null
-  };
+  }
   function compilationFinished (data, missingInputs, source) {
-    var noFatalErrors = true; // ie warnings are ok
+    var noFatalErrors = true // ie warnings are ok
 
     function isValidError (error) {
       // The deferred import is not a real error
       // FIXME: maybe have a better check?
       if (/Deferred import/.exec(error)) {
-        return false;
+        return false
       }
 
-      return utils.errortype(error) !== 'warning';
+      return utils.errortype(error) !== 'warning'
     }
 
     if (data['error'] !== undefined) {
       // Ignore warnings (and the 'Deferred import' error as those are generated by us as a workaround
       if (isValidError(data['error'])) {
-        noFatalErrors = false;
+        noFatalErrors = false
       }
     }
     if (data['errors'] !== undefined) {
       data['errors'].forEach(function (err) {
         // Ignore warnings and the 'Deferred import' error as those are generated by us as a workaround
         if (isValidError(err)) {
-          noFatalErrors = false;
+          noFatalErrors = false
         }
-      });
+      })
     }
 
     if (!noFatalErrors) {
       // There are fatal errors - abort here
-      self.lastCompilationResult = null;
-      self.event.trigger('compilationFinished', [false, data, source]);
+      self.lastCompilationResult = null
+      self.event.trigger('compilationFinished', [false, data, source])
     } else if (missingInputs !== undefined && missingInputs.length > 0) {
-      compile(missingInputs);
+      compile(missingInputs)
     } else {
       self.lastCompilationResult = {
         data: data,
         source: source
-      };
-      self.event.trigger('compilationFinished', [true, data, source]);
+      }
+      self.event.trigger('compilationFinished', [true, data, source])
     }
   }
 
   this.loadVersion = function (usingWorker, url) {
-    console.log('Loading ' + url + ' ' + (usingWorker ? 'with worker' : 'without worker'));
-    self.event.trigger('loadingCompiler', [url, usingWorker]);
+    console.log('Loading ' + url + ' ' + (usingWorker ? 'with worker' : 'without worker'))
+    self.event.trigger('loadingCompiler', [url, usingWorker])
 
     if (usingWorker) {
-      loadWorker(url);
+      loadWorker(url)
     } else {
-      loadInternal(url);
+      loadInternal(url)
     }
-  };
+  }
 
   function loadInternal (url) {
-    delete window.Module;
+    delete window.Module
     // NOTE: workaround some browsers?
-    window.Module = undefined;
+    window.Module = undefined
 
     // Set a safe fallback until the new one is loaded
     setCompileJSON(function (source, optimize) {
-      compilationFinished({error: 'Compiler not yet loaded.'});
-    });
+      compilationFinished({error: 'Compiler not yet loaded.'})
+    })
 
-    var newScript = document.createElement('script');
-    newScript.type = 'text/javascript';
-    newScript.src = url;
-    document.getElementsByTagName('head')[0].appendChild(newScript);
+    var newScript = document.createElement('script')
+    newScript.type = 'text/javascript'
+    newScript.src = url
+    document.getElementsByTagName('head')[0].appendChild(newScript)
     var check = window.setInterval(function () {
       if (!window.Module) {
-        return;
+        return
       }
-      window.clearInterval(check);
-      onInternalCompilerLoaded();
-    }, 200);
+      window.clearInterval(check)
+      onInternalCompilerLoaded()
+    }, 200)
   }
 
   function loadWorker (url) {
     if (worker !== null) {
-      worker.terminate();
+      worker.terminate()
     }
-    worker = webworkify(require('./compiler-worker.js'));
-    var jobs = [];
+    worker = webworkify(require('./compiler-worker.js'))
+    var jobs = []
     worker.addEventListener('message', function (msg) {
-      var data = msg.data;
+      var data = msg.data
       switch (data.cmd) {
         case 'versionLoaded':
-          compilerAcceptsMultipleFiles = !!data.acceptsMultipleFiles;
-          onCompilerLoaded(data.data);
-          break;
+          compilerAcceptsMultipleFiles = !!data.acceptsMultipleFiles
+          onCompilerLoaded(data.data)
+          break
         case 'compiled':
-          var result;
+          var result
           try {
-            result = JSON.parse(data.data);
+            result = JSON.parse(data.data)
           } catch (exception) {
-            result = { 'error': 'Invalid JSON output from the compiler: ' + exception };
+            result = { 'error': 'Invalid JSON output from the compiler: ' + exception }
           }
-          var sources = {};
+          var sources = {}
           if (data.job in jobs !== undefined) {
-            sources = jobs[data.job].sources;
-            delete jobs[data.job];
+            sources = jobs[data.job].sources
+            delete jobs[data.job]
           }
-          compilationFinished(result, data.missingInputs, sources);
-          break;
+          compilationFinished(result, data.missingInputs, sources)
+          break
       }
-    });
+    })
     worker.onerror = function (msg) {
-      compilationFinished({ error: 'Worker error: ' + msg.data });
-    };
+      compilationFinished({ error: 'Worker error: ' + msg.data })
+    }
     worker.addEventListener('error', function (msg) {
-      compilationFinished({ error: 'Worker error: ' + msg.data });
-    });
+      compilationFinished({ error: 'Worker error: ' + msg.data })
+    })
     compileJSON = function (source, optimize) {
-      jobs.push({sources: source});
-      worker.postMessage({cmd: 'compile', job: jobs.length - 1, source: JSON.stringify(source), optimize: optimize});
-    };
-    worker.postMessage({cmd: 'loadVersion', data: url});
+      jobs.push({sources: source})
+      worker.postMessage({cmd: 'compile', job: jobs.length - 1, source: JSON.stringify(source), optimize: optimize})
+    }
+    worker.postMessage({cmd: 'loadVersion', data: url})
   }
 
   function gatherImports (files, importHints, cb) {
-    importHints = importHints || [];
+    importHints = importHints || []
     if (!compilerAcceptsMultipleFiles) {
-      cb(files[editor.getCacheFile()]);
-      return;
+      cb(files[editor.getCacheFile()])
+      return
     }
-    var importRegex = /^\s*import\s*[\'\"]([^\'\"]+)[\'\"];/g;
-    var reloop = false;
-    var githubMatch;
+    var importRegex = /^\s*import\s*[\'\"]([^\'\"]+)[\'\"];/g
+    var reloop = false
+    var githubMatch
     do {
-      reloop = false;
+      reloop = false
       for (var fileName in files) {
-        var match;
+        var match
         while ((match = importRegex.exec(files[fileName]))) {
-          var importFilePath = match[1];
+          var importFilePath = match[1]
           if (importFilePath.startsWith('./')) {
-            importFilePath = importFilePath.slice(2);
+            importFilePath = importFilePath.slice(2)
           }
-          importHints.push(importFilePath);
+          importHints.push(importFilePath)
         }
       }
       while (importHints.length > 0) {
-        var m = importHints.pop();
+        var m = importHints.pop()
         if (m in files) {
-          continue;
+          continue
         }
         if (editor.hasFile(m)) {
-          files[m] = editor.getFile(m);
-          reloop = true;
+          files[m] = editor.getFile(m)
+          reloop = true
         } else if (m in cachedRemoteFiles) {
-          files[m] = cachedRemoteFiles[m];
-          reloop = true;
+          files[m] = cachedRemoteFiles[m]
+          reloop = true
         } else if ((githubMatch = /^(https?:\/\/)?(www.)?github.com\/([^\/]*\/[^\/]*)\/(.*)/.exec(m))) {
           handleGithubCall(githubMatch[3], githubMatch[4], function (err, content) {
             if (err) {
-              cb(null, 'Unable to import "' + m + '": ' + err);
-              return;
+              cb(null, 'Unable to import "' + m + '": ' + err)
+              return
             }
 
-            cachedRemoteFiles[m] = content;
-            files[m] = content;
+            cachedRemoteFiles[m] = content
+            files[m] = content
 
-            gatherImports(files, importHints, cb);
-          });
-          return;
+            gatherImports(files, importHints, cb)
+          })
+          return
         } else if (/^[^:]*:\/\//.exec(m)) {
-          cb(null, 'Unable to import "' + m + '": Unsupported URL');
-          return;
+          cb(null, 'Unable to import "' + m + '": Unsupported URL')
+          return
         } else {
-          cb(null, 'Unable to import "' + m + '": File not found');
-          return;
+          cb(null, 'Unable to import "' + m + '": File not found')
+          return
         }
       }
-    } while (reloop);
-    cb({ 'sources': files });
+    } while (reloop)
+    cb({ 'sources': files })
   }
 }
 
-module.exports = Compiler;
+module.exports = Compiler
diff --git a/src/app/debugger.js b/src/app/debugger.js
index a1ba88b3b8..b40ac9bb9c 100644
--- a/src/app/debugger.js
+++ b/src/app/debugger.js
@@ -1,44 +1,44 @@
-'use strict';
+'use strict'
 
-var remix = require('ethereum-remix');
-var utils = require('./utils');
-var ace = require('brace');
-var Range = ace.acequire('ace/range').Range;
+var remix = require('ethereum-remix')
+var utils = require('./utils')
+var ace = require('brace')
+var Range = ace.acequire('ace/range').Range
 
 /**
  * Manage remix and source highlighting
  */
 function Debugger (id, editor, compiler, executionContextEvent, switchToFile) {
-  this.el = document.querySelector(id);
-  this.debugger = new remix.ui.Debugger();
-  this.sourceMappingDecoder = new remix.util.SourceMappingDecoder();
-  this.el.appendChild(this.debugger.render());
-  this.editor = editor;
-  this.switchToFile = switchToFile;
-  this.compiler = compiler;
-  this.cache = new Cache();
-
-  var self = this;
+  this.el = document.querySelector(id)
+  this.debugger = new remix.ui.Debugger()
+  this.sourceMappingDecoder = new remix.util.SourceMappingDecoder()
+  this.el.appendChild(this.debugger.render())
+  this.editor = editor
+  this.switchToFile = switchToFile
+  this.compiler = compiler
+  this.cache = new Cache()
+
+  var self = this
   executionContextEvent.register('contextChanged', this, function (context) {
-    self.switchProvider(context);
-  });
+    self.switchProvider(context)
+  })
 
-  this.lastCompilationResult = null;
+  this.lastCompilationResult = null
   this.debugger.register('newTraceLoaded', this, function () {
-    self.cache.clear();
-    self.lastCompilationResult = self.compiler.lastCompilationResult;
-  });
+    self.cache.clear()
+    self.lastCompilationResult = self.compiler.lastCompilationResult
+  })
 
   this.debugger.register('traceUnloaded', this, function () {
-    self.removeCurrentMarker();
-    self.cache.clear();
-  });
+    self.removeCurrentMarker()
+    self.cache.clear()
+  })
 
   this.editor.onChangeSetup(function () {
     if (arguments.length > 0) { // if arguments.length === 0 this is a session change, we don't want to stop debugging in that case
-      self.debugger.unLoad();
+      self.debugger.unLoad()
     }
-  });
+  })
 
   // register selected code item, highlight the corresponding source location
   this.debugger.codeManager.register('changed', this, function (code, address, index) {
@@ -46,16 +46,16 @@ function Debugger (id, editor, compiler, executionContextEvent, switchToFile) {
       this.debugger.sourceLocationTracker.getSourceLocation(address, index, self.lastCompilationResult.data.contracts, function (error, rawLocation) {
         if (!error) {
           if (!self.cache.lineBreakPositionsByContent[address]) {
-            self.cache.lineBreakPositionsByContent[address] = self.sourceMappingDecoder.getLinebreakPositions(self.editor.getFile(self.lastCompilationResult.data.sourceList[rawLocation.file]));
+            self.cache.lineBreakPositionsByContent[address] = self.sourceMappingDecoder.getLinebreakPositions(self.editor.getFile(self.lastCompilationResult.data.sourceList[rawLocation.file]))
           }
-          var lineColumnPos = self.sourceMappingDecoder.convertOffsetToLineColumn(rawLocation, self.cache.lineBreakPositionsByContent[address]);
-          self.highlight(lineColumnPos, rawLocation);
+          var lineColumnPos = self.sourceMappingDecoder.convertOffsetToLineColumn(rawLocation, self.cache.lineBreakPositionsByContent[address])
+          self.highlight(lineColumnPos, rawLocation)
         } else {
-          self.removeCurrentMarker();
+          self.removeCurrentMarker()
         }
-      });
+      })
     }
-  });
+  })
 }
 
 /**
@@ -64,13 +64,13 @@ function Debugger (id, editor, compiler, executionContextEvent, switchToFile) {
  * @param {String} txHash    - hash of the transaction
  */
 Debugger.prototype.debug = function (txHash) {
-  var self = this;
+  var self = this
   this.debugger.web3().eth.getTransaction(txHash, function (error, tx) {
     if (!error) {
-      self.debugger.debug(tx);
+      self.debugger.debug(tx)
     }
-  });
-};
+  })
+}
 
 /**
  * highlight the given @arg lineColumnPos
@@ -79,15 +79,15 @@ Debugger.prototype.debug = function (txHash) {
  * @param {Object} rawLocation - raw position of the source code to hightlight {start, length, file, jump}
  */
 Debugger.prototype.highlight = function (lineColumnPos, rawLocation) {
-  var name = utils.fileNameFromKey(this.editor.getCacheFile()); // current opened tab
-  var source = this.lastCompilationResult.data.sourceList[rawLocation.file]; // auto switch to that tab
-  this.removeCurrentMarker();
+  var name = utils.fileNameFromKey(this.editor.getCacheFile()) // current opened tab
+  var source = this.lastCompilationResult.data.sourceList[rawLocation.file] // auto switch to that tab
+  this.removeCurrentMarker()
   if (name !== source) {
-    this.switchToFile(source); // command the app to swicth to the next file
+    this.switchToFile(source) // command the app to swicth to the next file
   }
-  this.currentRange = new Range(lineColumnPos.start.line, lineColumnPos.start.column, lineColumnPos.end.line, lineColumnPos.end.column);
-  this.currentMarker = this.editor.addMarker(this.currentRange, 'highlightcode');
-};
+  this.currentRange = new Range(lineColumnPos.start.line, lineColumnPos.start.column, lineColumnPos.end.line, lineColumnPos.end.column)
+  this.currentMarker = this.editor.addMarker(this.currentRange, 'highlightcode')
+}
 
 /**
  * add a new web3 provider to remix
@@ -96,8 +96,8 @@ Debugger.prototype.highlight = function (lineColumnPos, rawLocation) {
  * @param {Object} obj  - provider
  */
 Debugger.prototype.addProvider = function (type, obj) {
-  this.debugger.addProvider(type, obj);
-};
+  this.debugger.addProvider(type, obj)
+}
 
 /**
  * switch the provider
@@ -105,32 +105,32 @@ Debugger.prototype.addProvider = function (type, obj) {
  * @param {String} type - type/name of the provider to use
  */
 Debugger.prototype.switchProvider = function (type) {
-  this.debugger.switchProvider(type);
-};
+  this.debugger.switchProvider(type)
+}
 
 /**
  * get the current provider
  */
 Debugger.prototype.web3 = function (type) {
-  return this.debugger.web3();
-};
+  return this.debugger.web3()
+}
 
 /**
  * unhighlight the current highlighted statement
  */
 Debugger.prototype.removeCurrentMarker = function () {
   if (this.currentMarker) {
-    this.editor.removeMarker(this.currentMarker);
-    this.currentMarker = null;
+    this.editor.removeMarker(this.currentMarker)
+    this.currentMarker = null
   }
-};
+}
 
 function Cache () {
-  this.contentLineBreakPosition = {};
+  this.contentLineBreakPosition = {}
 }
 
 Cache.prototype.clear = function () {
-  this.lineBreakPositionsByContent = {};
-};
+  this.lineBreakPositionsByContent = {}
+}
 
-module.exports = Debugger;
+module.exports = Debugger
diff --git a/src/app/editor.js b/src/app/editor.js
index 0110b69896..32309a2c5d 100644
--- a/src/app/editor.js
+++ b/src/app/editor.js
@@ -1,194 +1,194 @@
 /* global FileReader */
-'use strict';
+'use strict'
 
-var utils = require('./utils');
-var examples = require('./example-contracts');
+var utils = require('./utils')
+var examples = require('./example-contracts')
 
-var ace = require('brace');
-require('../mode-solidity.js');
+var ace = require('brace')
+require('../mode-solidity.js')
 
 function Editor (loadingFromGist, storage) {
-  var SOL_CACHE_UNTITLED = utils.fileKey('Untitled');
-  var SOL_CACHE_FILE = null;
+  var SOL_CACHE_UNTITLED = utils.fileKey('Untitled')
+  var SOL_CACHE_FILE = null
 
-  var editor = ace.edit('input');
-  var sessions = {};
-  var sourceAnnotations = [];
+  var editor = ace.edit('input')
+  var sessions = {}
+  var sourceAnnotations = []
 
-  setupStuff(getFiles());
+  setupStuff(getFiles())
 
   this.addMarker = function (range, cssClass) {
-    return editor.session.addMarker(range, cssClass);
-  };
+    return editor.session.addMarker(range, cssClass)
+  }
 
   this.removeMarker = function (markerId) {
-    editor.session.removeMarker(markerId);
-  };
+    editor.session.removeMarker(markerId)
+  }
 
   this.newFile = function () {
-    var untitledCount = '';
+    var untitledCount = ''
     while (storage.exists(SOL_CACHE_UNTITLED + untitledCount)) {
-      untitledCount = (untitledCount - 0) + 1;
+      untitledCount = (untitledCount - 0) + 1
     }
-    SOL_CACHE_FILE = SOL_CACHE_UNTITLED + untitledCount;
-    this.setCacheFileContent('');
-  };
+    SOL_CACHE_FILE = SOL_CACHE_UNTITLED + untitledCount
+    this.setCacheFileContent('')
+  }
 
   this.uploadFile = function (file, callback) {
-    var fileReader = new FileReader();
-    var cacheName = utils.fileKey(file.name);
+    var fileReader = new FileReader()
+    var cacheName = utils.fileKey(file.name)
 
     fileReader.onload = function (e) {
-      storage.set(cacheName, e.target.result);
-      SOL_CACHE_FILE = cacheName;
-      callback();
-    };
-    fileReader.readAsText(file);
-  };
+      storage.set(cacheName, e.target.result)
+      SOL_CACHE_FILE = cacheName
+      callback()
+    }
+    fileReader.readAsText(file)
+  }
 
   this.setCacheFileContent = function (content) {
-    storage.set(SOL_CACHE_FILE, content);
-  };
+    storage.set(SOL_CACHE_FILE, content)
+  }
 
   this.setCacheFile = function (cacheFile) {
-    SOL_CACHE_FILE = cacheFile;
-  };
+    SOL_CACHE_FILE = cacheFile
+  }
 
   this.getCacheFile = function () {
-    return SOL_CACHE_FILE;
-  };
+    return SOL_CACHE_FILE
+  }
 
   this.cacheFileIsPresent = function () {
-    return !!SOL_CACHE_FILE;
-  };
+    return !!SOL_CACHE_FILE
+  }
 
   this.setNextFile = function (fileKey) {
-    var index = this.getFiles().indexOf(fileKey);
-    this.setCacheFile(this.getFiles()[ Math.max(0, index - 1) ]);
-  };
+    var index = this.getFiles().indexOf(fileKey)
+    this.setCacheFile(this.getFiles()[ Math.max(0, index - 1) ])
+  }
 
   this.resetSession = function () {
-    editor.setSession(sessions[SOL_CACHE_FILE]);
-    editor.focus();
-  };
+    editor.setSession(sessions[SOL_CACHE_FILE])
+    editor.focus()
+  }
 
   this.removeSession = function (fileKey) {
-    delete sessions[fileKey];
-  };
+    delete sessions[fileKey]
+  }
 
   this.renameSession = function (oldFileKey, newFileKey) {
     if (oldFileKey !== newFileKey) {
-      sessions[newFileKey] = sessions[oldFileKey];
-      this.removeSession(oldFileKey);
+      sessions[newFileKey] = sessions[oldFileKey]
+      this.removeSession(oldFileKey)
     }
-  };
+  }
 
   this.hasFile = function (name) {
-    return this.getFiles().indexOf(utils.fileKey(name)) !== -1;
-  };
+    return this.getFiles().indexOf(utils.fileKey(name)) !== -1
+  }
 
   this.getFile = function (name) {
-    return storage.get(utils.fileKey(name));
-  };
+    return storage.get(utils.fileKey(name))
+  }
 
   function getFiles () {
-    var files = [];
+    var files = []
     storage.keys().forEach(function (f) {
       if (utils.isCachedFile(f)) {
-        files.push(f);
-        if (!sessions[f]) sessions[f] = newEditorSession(f);
+        files.push(f)
+        if (!sessions[f]) sessions[f] = newEditorSession(f)
       }
-    });
-    return files;
+    })
+    return files
   }
-  this.getFiles = getFiles;
+  this.getFiles = getFiles
 
   this.packageFiles = function () {
-    var files = {};
-    var filesArr = this.getFiles();
+    var files = {}
+    var filesArr = this.getFiles()
 
     for (var f in filesArr) {
       files[utils.fileNameFromKey(filesArr[f])] = {
         content: storage.get(filesArr[f])
-      };
+      }
     }
-    return files;
-  };
+    return files
+  }
 
   this.resize = function () {
-    editor.resize();
-    var session = editor.getSession();
-    session.setUseWrapMode(document.querySelector('#editorWrap').checked);
+    editor.resize()
+    var session = editor.getSession()
+    session.setUseWrapMode(document.querySelector('#editorWrap').checked)
     if (session.getUseWrapMode()) {
-      var characterWidth = editor.renderer.characterWidth;
-      var contentWidth = editor.container.ownerDocument.getElementsByClassName('ace_scroller')[0].clientWidth;
+      var characterWidth = editor.renderer.characterWidth
+      var contentWidth = editor.container.ownerDocument.getElementsByClassName('ace_scroller')[0].clientWidth
 
       if (contentWidth > 0) {
-        session.setWrapLimit(parseInt(contentWidth / characterWidth, 10));
+        session.setWrapLimit(parseInt(contentWidth / characterWidth, 10))
       }
     }
-  };
+  }
 
   this.getValue = function () {
-    return editor.getValue();
-  };
+    return editor.getValue()
+  }
 
   this.clearAnnotations = function () {
-    sourceAnnotations = [];
-    editor.getSession().clearAnnotations();
-  };
+    sourceAnnotations = []
+    editor.getSession().clearAnnotations()
+  }
 
   this.addAnnotation = function (annotation) {
-    sourceAnnotations[sourceAnnotations.length] = annotation;
-    this.setAnnotations(sourceAnnotations);
-  };
+    sourceAnnotations[sourceAnnotations.length] = annotation
+    this.setAnnotations(sourceAnnotations)
+  }
 
   this.setAnnotations = function (sourceAnnotations) {
-    editor.getSession().setAnnotations(sourceAnnotations);
-  };
+    editor.getSession().setAnnotations(sourceAnnotations)
+  }
 
   this.onChangeSetup = function (onChange) {
-    editor.getSession().on('change', onChange);
+    editor.getSession().on('change', onChange)
     editor.on('changeSession', function () {
-      editor.getSession().on('change', onChange);
-      onChange();
-    });
-  };
+      editor.getSession().on('change', onChange)
+      onChange()
+    })
+  }
 
   this.handleErrorClick = function (errLine, errCol) {
-    editor.focus();
-    editor.gotoLine(errLine + 1, errCol - 1, true);
-  };
+    editor.focus()
+    editor.gotoLine(errLine + 1, errCol - 1, true)
+  }
 
   function newEditorSession (filekey) {
-    var s = new ace.EditSession(storage.get(filekey), 'ace/mode/javascript');
-    s.setUndoManager(new ace.UndoManager());
-    s.setTabSize(4);
-    s.setUseSoftTabs(true);
-    sessions[filekey] = s;
-    return s;
+    var s = new ace.EditSession(storage.get(filekey), 'ace/mode/javascript')
+    s.setUndoManager(new ace.UndoManager())
+    s.setTabSize(4)
+    s.setUseSoftTabs(true)
+    sessions[filekey] = s
+    return s
   }
 
   function setupStuff (files) {
     if (files.length === 0) {
-      if (loadingFromGist) return;
-      files.push(utils.fileKey(examples.ballot.name));
-      storage.set(utils.fileKey(examples.ballot.name), examples.ballot.content);
+      if (loadingFromGist) return
+      files.push(utils.fileKey(examples.ballot.name))
+      storage.set(utils.fileKey(examples.ballot.name), examples.ballot.content)
     }
 
-    SOL_CACHE_FILE = files[0];
+    SOL_CACHE_FILE = files[0]
 
     for (var x in files) {
-      sessions[files[x]] = newEditorSession(files[x]);
+      sessions[files[x]] = newEditorSession(files[x])
     }
 
-    editor.setSession(sessions[SOL_CACHE_FILE]);
-    editor.resize(true);
+    editor.setSession(sessions[SOL_CACHE_FILE])
+    editor.resize(true)
 
     // Unmap ctrl-t & ctrl-f
-    editor.commands.bindKeys({ 'ctrl-t': null });
-    editor.commands.bindKeys({ 'ctrl-f': null });
+    editor.commands.bindKeys({ 'ctrl-t': null })
+    editor.commands.bindKeys({ 'ctrl-f': null })
   }
 }
 
-module.exports = Editor;
+module.exports = Editor
diff --git a/src/app/example-contracts.js b/src/app/example-contracts.js
index 78c9c2773e..b41bf5770c 100644
--- a/src/app/example-contracts.js
+++ b/src/app/example-contracts.js
@@ -1,69 +1,69 @@
-var ballot = `pragma solidity ^0.4.0;
+var ballot = `pragma solidity ^0.4.0
 contract Ballot {
 
     struct Voter {
-        uint weight;
-        bool voted;
-        uint8 vote;
-        address delegate;
+        uint weight
+        bool voted
+        uint8 vote
+        address delegate
     }
     struct Proposal {
-        uint voteCount;
+        uint voteCount
     }
 
-    address chairperson;
-    mapping(address => Voter) voters;
-    Proposal[] proposals;
+    address chairperson
+    mapping(address => Voter) voters
+    Proposal[] proposals
 
     /// Create a new ballot with $(_numProposals) different proposals.
     function Ballot(uint8 _numProposals) {
-        chairperson = msg.sender;
-        voters[chairperson].weight = 1;
-        proposals.length = _numProposals;
+        chairperson = msg.sender
+        voters[chairperson].weight = 1
+        proposals.length = _numProposals
     }
 
     /// Give $(voter) the right to vote on this ballot.
     /// May only be called by $(chairperson).
     function giveRightToVote(address voter) {
-        if (msg.sender != chairperson || voters[voter].voted) return;
-        voters[voter].weight = 1;
+        if (msg.sender != chairperson || voters[voter].voted) return
+        voters[voter].weight = 1
     }
 
     /// Delegate your vote to the voter $(to).
     function delegate(address to) {
-        Voter sender = voters[msg.sender]; // assigns reference
-        if (sender.voted) return;
+        Voter sender = voters[msg.sender] // assigns reference
+        if (sender.voted) return
         while (voters[to].delegate != address(0) && voters[to].delegate != msg.sender)
-            to = voters[to].delegate;
-        if (to == msg.sender) return;
-        sender.voted = true;
-        sender.delegate = to;
-        Voter delegate = voters[to];
+            to = voters[to].delegate
+        if (to == msg.sender) return
+        sender.voted = true
+        sender.delegate = to
+        Voter delegate = voters[to]
         if (delegate.voted)
-            proposals[delegate.vote].voteCount += sender.weight;
+            proposals[delegate.vote].voteCount += sender.weight
         else
-            delegate.weight += sender.weight;
+            delegate.weight += sender.weight
     }
 
     /// Give a single vote to proposal $(proposal).
     function vote(uint8 proposal) {
-        Voter sender = voters[msg.sender];
-        if (sender.voted || proposal >= proposals.length) return;
-        sender.voted = true;
-        sender.vote = proposal;
-        proposals[proposal].voteCount += sender.weight;
+        Voter sender = voters[msg.sender]
+        if (sender.voted || proposal >= proposals.length) return
+        sender.voted = true
+        sender.vote = proposal
+        proposals[proposal].voteCount += sender.weight
     }
 
     function winningProposal() constant returns (uint8 winningProposal) {
-        uint256 winningVoteCount = 0;
+        uint256 winningVoteCount = 0
         for (uint8 proposal = 0; proposal < proposals.length; proposal++)
             if (proposals[proposal].voteCount > winningVoteCount) {
-                winningVoteCount = proposals[proposal].voteCount;
-                winningProposal = proposal;
+                winningVoteCount = proposals[proposal].voteCount
+                winningProposal = proposal
             }
     }
-}`;
+}`
 
 module.exports = {
   ballot: { name: 'ballot.sol', content: ballot }
-};
+}
diff --git a/src/app/execution-context.js b/src/app/execution-context.js
index b5d44818d2..a00bbc22f6 100644
--- a/src/app/execution-context.js
+++ b/src/app/execution-context.js
@@ -1,121 +1,121 @@
 /* global confirm */
-'use strict';
+'use strict'
 
-var $ = require('jquery');
-var Web3 = require('web3');
-var EventManager = require('../lib/eventManager');
-var EthJSVM = require('ethereumjs-vm');
+var $ = require('jquery')
+var Web3 = require('web3')
+var EventManager = require('../lib/eventManager')
+var EthJSVM = require('ethereumjs-vm')
 
-var injectedProvider;
+var injectedProvider
 
-var web3;
+var web3
 if (typeof window.web3 !== 'undefined') {
-  injectedProvider = window.web3.currentProvider;
-  web3 = new Web3(injectedProvider);
+  injectedProvider = window.web3.currentProvider
+  web3 = new Web3(injectedProvider)
 } else {
-  web3 = new Web3(new Web3.providers.HttpProvider('http://localhost:8545'));
+  web3 = new Web3(new Web3.providers.HttpProvider('http://localhost:8545'))
 }
 
-var vm = new EthJSVM(null, null, { activatePrecompiles: true, enableHomestead: true });
-vm.stateManager.checkpoint();
+var vm = new EthJSVM(null, null, { activatePrecompiles: true, enableHomestead: true })
+vm.stateManager.checkpoint()
 
 /*
   trigger contextChanged, web3EndpointChanged
 */
 function ExecutionContext () {
-  var self = this;
-  this.event = new EventManager();
-  var executionContext = injectedProvider ? 'injected' : 'vm';
+  var self = this
+  this.event = new EventManager()
+  var executionContext = injectedProvider ? 'injected' : 'vm'
 
   this.isVM = function () {
-    return executionContext === 'vm';
-  };
+    return executionContext === 'vm'
+  }
 
   this.web3 = function () {
-    return web3;
-  };
+    return web3
+  }
 
   this.vm = function () {
-    return vm;
-  };
+    return vm
+  }
 
   this.setEndPointUrl = function (url) {
-    $web3endpoint.val(url);
-  };
+    $web3endpoint.val(url)
+  }
 
   this.setContext = function (context) {
-    executionContext = context;
-    executionContextChange(context);
-    setExecutionContextRadio();
-  };
+    executionContext = context
+    executionContextChange(context)
+    setExecutionContextRadio()
+  }
 
-  var $injectedToggle = $('#injected-mode');
-  var $vmToggle = $('#vm-mode');
-  var $web3Toggle = $('#web3-mode');
-  var $web3endpoint = $('#web3Endpoint');
+  var $injectedToggle = $('#injected-mode')
+  var $vmToggle = $('#vm-mode')
+  var $web3Toggle = $('#web3-mode')
+  var $web3endpoint = $('#web3Endpoint')
 
   if (web3.providers && web3.currentProvider instanceof web3.providers.IpcProvider) {
-    $web3endpoint.val('ipc');
+    $web3endpoint.val('ipc')
   }
 
-  setExecutionContextRadio();
+  setExecutionContextRadio()
 
-  $injectedToggle.on('change', executionContextUIChange);
-  $vmToggle.on('change', executionContextUIChange);
-  $web3Toggle.on('change', executionContextUIChange);
+  $injectedToggle.on('change', executionContextUIChange)
+  $vmToggle.on('change', executionContextUIChange)
+  $web3Toggle.on('change', executionContextUIChange)
   $web3endpoint.on('change', function () {
-    setProviderFromEndpoint();
+    setProviderFromEndpoint()
     if (executionContext === 'web3') {
-      self.event.trigger('web3EndpointChanged');
+      self.event.trigger('web3EndpointChanged')
     }
-  });
+  })
 
   function executionContextUIChange (ev) {
-    executionContextChange(ev.target.value);
+    executionContextChange(ev.target.value)
   }
 
   function executionContextChange (context) {
     if (context === 'web3' && !confirm('Are you sure you want to connect to a local ethereum node?')) {
-      setExecutionContextRadio();
+      setExecutionContextRadio()
     } else if (context === 'injected' && injectedProvider === undefined) {
-      setExecutionContextRadio();
+      setExecutionContextRadio()
     } else {
       if (context === 'web3') {
-        executionContext = context;
-        setProviderFromEndpoint();
-        self.event.trigger('contextChanged', ['web3']);
+        executionContext = context
+        setProviderFromEndpoint()
+        self.event.trigger('contextChanged', ['web3'])
       } else if (context === 'injected') {
-        executionContext = context;
-        web3.setProvider(injectedProvider);
-        self.event.trigger('contextChanged', ['injected']);
+        executionContext = context
+        web3.setProvider(injectedProvider)
+        self.event.trigger('contextChanged', ['injected'])
       } else if (context === 'vm') {
-        executionContext = context;
+        executionContext = context
         vm.stateManager.revert(function () {
-          vm.stateManager.checkpoint();
-        });
-        self.event.trigger('contextChanged', ['vm']);
+          vm.stateManager.checkpoint()
+        })
+        self.event.trigger('contextChanged', ['vm'])
       }
     }
   }
 
   function setProviderFromEndpoint () {
-    var endpoint = $web3endpoint.val();
+    var endpoint = $web3endpoint.val()
     if (endpoint === 'ipc') {
-      web3.setProvider(new web3.providers.IpcProvider());
+      web3.setProvider(new web3.providers.IpcProvider())
     } else {
-      web3.setProvider(new web3.providers.HttpProvider(endpoint));
+      web3.setProvider(new web3.providers.HttpProvider(endpoint))
     }
   }
 
   function setExecutionContextRadio () {
     if (executionContext === 'injected') {
-      $injectedToggle.get(0).checked = true;
+      $injectedToggle.get(0).checked = true
     } else if (executionContext === 'vm') {
-      $vmToggle.get(0).checked = true;
+      $vmToggle.get(0).checked = true
     } else if (executionContext === 'web3') {
-      $web3Toggle.get(0).checked = true;
+      $web3Toggle.get(0).checked = true
     }
   }
 }
 
-module.exports = ExecutionContext;
+module.exports = ExecutionContext
diff --git a/src/app/formalVerification.js b/src/app/formalVerification.js
index 41676d0e44..aeab7b2be0 100644
--- a/src/app/formalVerification.js
+++ b/src/app/formalVerification.js
@@ -1,48 +1,48 @@
-'use strict';
+'use strict'
 
-var $ = require('jquery');
-var EventManager = require('../lib/eventManager');
+var $ = require('jquery')
+var EventManager = require('../lib/eventManager')
 
 /*
   trigger compilationFinished
 */
 function FormalVerification (outputElement, compilerEvent) {
-  this.event = new EventManager();
-  this.outputElement = outputElement;
-  var self = this;
+  this.event = new EventManager()
+  this.outputElement = outputElement
+  var self = this
   compilerEvent.register('compilationFinished', this, function (success, data, source) {
     if (success) {
-      self.compilationFinished(data);
+      self.compilationFinished(data)
     }
-  });
+  })
   compilerEvent.register('compilationStarted', this, function () {
     $('#formalVerificationInput', self.outputElement)
-    .val('')
-    .hide();
-    $('#formalVerificationErrors').empty();
-  });
+      .val('')
+      .hide()
+    $('#formalVerificationErrors').empty()
+  })
 }
 
 FormalVerification.prototype.compilationFinished = function (compilationResult) {
   if (compilationResult.formal === undefined) {
-    this.event.trigger('compilationFinished', [false, 'Formal verification not supported by this compiler version.', $('#formalVerificationErrors'), true]);
+    this.event.trigger('compilationFinished', [false, 'Formal verification not supported by this compiler version.', $('#formalVerificationErrors'), true])
   } else {
     if (compilationResult.formal['why3'] !== undefined) {
       $('#formalVerificationInput', this.outputElement).val(
         '(* copy this to http://why3.lri.fr/try/ *)' +
         compilationResult.formal['why3']
       )
-        .show();
+        .show()
     }
     if (compilationResult.formal.errors !== undefined) {
-      var errors = compilationResult.formal.errors;
+      var errors = compilationResult.formal.errors
       for (var i = 0; i < errors.length; i++) {
-        this.event.trigger('compilationFinished', [false, errors[i], $('#formalVerificationErrors'), true]);
+        this.event.trigger('compilationFinished', [false, errors[i], $('#formalVerificationErrors'), true])
       }
     } else {
-      this.event.trigger('compilationFinished', [true, null, null, true]);
+      this.event.trigger('compilationFinished', [true, null, null, true])
     }
   }
-};
+}
 
-module.exports = FormalVerification;
+module.exports = FormalVerification
diff --git a/src/app/gist-handler.js b/src/app/gist-handler.js
index a706c73dfd..1064b0a93b 100644
--- a/src/app/gist-handler.js
+++ b/src/app/gist-handler.js
@@ -1,33 +1,33 @@
-'use strict';
+'use strict'
 
 // Allowing window to be overriden for testing
 function GistHandler (_window) {
-  if (_window === undefined) _window = window;
+  if (_window === undefined) _window = window
 
   this.handleLoad = function (params, cb) {
-    var loadingFromGist = false;
-    var gistId;
+    var loadingFromGist = false
+    var gistId
     if (params['gist'] === '') {
-      var str = _window.prompt('Enter the URL or ID of the Gist you would like to load.');
+      var str = _window.prompt('Enter the URL or ID of the Gist you would like to load.')
       if (str !== '') {
-        gistId = getGistId(str);
-        loadingFromGist = !!gistId;
+        gistId = getGistId(str)
+        loadingFromGist = !!gistId
       }
     } else {
-      gistId = params['gist'];
-      loadingFromGist = !!gistId;
+      gistId = params['gist']
+      loadingFromGist = !!gistId
     }
     if (loadingFromGist) {
-      cb(gistId);
+      cb(gistId)
     }
-    return loadingFromGist;
-  };
+    return loadingFromGist
+  }
 
   function getGistId (str) {
-    var idr = /[0-9A-Fa-f]{8,}/;
-    var match = idr.exec(str);
-    return match ? match[0] : null;
+    var idr = /[0-9A-Fa-f]{8,}/
+    var match = idr.exec(str)
+    return match ? match[0] : null
   }
 }
 
-module.exports = GistHandler;
+module.exports = GistHandler
diff --git a/src/app/query-params.js b/src/app/query-params.js
index d775d4516e..739971fac2 100644
--- a/src/app/query-params.js
+++ b/src/app/query-params.js
@@ -1,42 +1,42 @@
-'use strict';
+'use strict'
 
 // Allowing window to be overriden for testing
 function QueryParams (_window) {
-  if (_window === undefined) _window = window;
+  if (_window === undefined) _window = window
 
   this.get = function () {
-    var qs = _window.location.hash.substr(1);
+    var qs = _window.location.hash.substr(1)
 
     if (_window.location.search.length > 0) {
       // use legacy query params instead of hash
-      _window.location.hash = _window.location.search.substr(1);
-      _window.location.search = '';
+      _window.location.hash = _window.location.search.substr(1)
+      _window.location.search = ''
     }
 
-    var params = {};
-    var parts = qs.split('&');
+    var params = {}
+    var parts = qs.split('&')
     for (var x in parts) {
-      var keyValue = parts[x].split('=');
+      var keyValue = parts[x].split('=')
       if (keyValue[0] !== '') {
-        params[keyValue[0]] = keyValue[1];
+        params[keyValue[0]] = keyValue[1]
       }
     }
-    return params;
-  };
+    return params
+  }
 
   this.update = function (params) {
-    var currentParams = this.get();
-    var keys = Object.keys(params);
+    var currentParams = this.get()
+    var keys = Object.keys(params)
     for (var x in keys) {
-      currentParams[keys[x]] = params[keys[x]];
+      currentParams[keys[x]] = params[keys[x]]
     }
-    var queryString = '#';
-    var updatedKeys = Object.keys(currentParams);
+    var queryString = '#'
+    var updatedKeys = Object.keys(currentParams)
     for (var y in updatedKeys) {
-      queryString += updatedKeys[y] + '=' + currentParams[updatedKeys[y]] + '&';
+      queryString += updatedKeys[y] + '=' + currentParams[updatedKeys[y]] + '&'
     }
-    _window.location.hash = queryString.slice(0, -1);
-  };
+    _window.location.hash = queryString.slice(0, -1)
+  }
 }
 
-module.exports = QueryParams;
+module.exports = QueryParams
diff --git a/src/app/renderer.js b/src/app/renderer.js
index db30368fd2..fefd292665 100644
--- a/src/app/renderer.js
+++ b/src/app/renderer.js
@@ -1,149 +1,149 @@
-'use strict';
+'use strict'
 
-var $ = require('jquery');
+var $ = require('jquery')
 
-var utils = require('./utils');
-var uiHelper = require('./ui-helper');
+var utils = require('./utils')
+var uiHelper = require('./ui-helper')
 
 function Renderer (editor, web3, updateFiles, udapp, executionContext, formalVerificationEvent, compilerEvent) {
-  this.editor = editor;
-  this.web3 = web3;
-  this.updateFiles = updateFiles;
-  this.udapp = udapp;
-  this.executionContext = executionContext;
-  var self = this;
+  this.editor = editor
+  this.web3 = web3
+  this.updateFiles = updateFiles
+  this.udapp = udapp
+  this.executionContext = executionContext
+  var self = this
   formalVerificationEvent.register('compilationFinished', this, function (success, message, container, noAnnotations) {
     if (!success) {
-      self.error(message, container, noAnnotations);
+      self.error(message, container, noAnnotations)
     }
-  });
+  })
   compilerEvent.register('compilationFinished', this, function (success, data, source) {
-    $('#output').empty();
+    $('#output').empty()
     if (success) {
-      self.contracts(data, source);
+      self.contracts(data, source)
     }
 
     // NOTE: still need to display as there might be warnings
     if (data['error']) {
-      self.error(data['error']);
+      self.error(data['error'])
     }
     if (data['errors']) {
       data['errors'].forEach(function (err) {
-        self.error(err);
-      });
+        self.error(err)
+      })
     }
-  });
+  })
 }
 
 Renderer.prototype.error = function (message, container, noAnnotations) {
-  var self = this;
-  var type = utils.errortype(message);
-  var $pre = $('<pre />').text(message);
-  var $error = $('<div class="sol ' + type + '"><div class="close"><i class="fa fa-close"></i></div></div>').prepend($pre);
+  var self = this
+  var type = utils.errortype(message)
+  var $pre = $('<pre />').text(message)
+  var $error = $('<div class="sol ' + type + '"><div class="close"><i class="fa fa-close"></i></div></div>').prepend($pre)
   if (container === undefined) {
-    container = $('#output');
+    container = $('#output')
   }
-  container.append($error);
-  var err = message.match(/^([^:]*):([0-9]*):(([0-9]*):)? /);
+  container.append($error)
+  var err = message.match(/^([^:]*):([0-9]*):(([0-9]*):)? /)
   if (err) {
-    var errFile = err[1];
-    var errLine = parseInt(err[2], 10) - 1;
-    var errCol = err[4] ? parseInt(err[4], 10) : 0;
+    var errFile = err[1]
+    var errLine = parseInt(err[2], 10) - 1
+    var errCol = err[4] ? parseInt(err[4], 10) : 0
     if (!noAnnotations && (errFile === '' || errFile === utils.fileNameFromKey(self.editor.getCacheFile()))) {
       self.editor.addAnnotation({
         row: errLine,
         column: errCol,
         text: message,
         type: type
-      });
+      })
     }
     $error.click(function (ev) {
       if (errFile !== '' && errFile !== utils.fileNameFromKey(self.editor.getCacheFile()) && self.editor.hasFile(errFile)) {
         // Switch to file
-        self.editor.setCacheFile(utils.fileKey(errFile));
-        self.updateFiles();
+        self.editor.setCacheFile(utils.fileKey(errFile))
+        self.updateFiles()
       // @TODO could show some error icon in files with errors
       }
-      self.editor.handleErrorClick(errLine, errCol);
-    });
+      self.editor.handleErrorClick(errLine, errCol)
+    })
     $error.find('.close').click(function (ev) {
-      ev.preventDefault();
-      $error.remove();
-      return false;
-    });
+      ev.preventDefault()
+      $error.remove()
+      return false
+    })
   }
-};
+}
 
 Renderer.prototype.contracts = function (data, source) {
-  var udappContracts = [];
+  var udappContracts = []
   for (var contractName in data.contracts) {
-    var contract = data.contracts[contractName];
+    var contract = data.contracts[contractName]
     udappContracts.push({
       name: contractName,
       interface: contract['interface'],
       bytecode: contract.bytecode
-    });
+    })
   }
 
   // rendering function used by udapp. they need data and source
   var combined = function (contractName, jsonInterface, bytecode) {
-    return JSON.stringify([{ name: contractName, interface: jsonInterface, bytecode: bytecode }]);
-  };
+    return JSON.stringify([{ name: contractName, interface: jsonInterface, bytecode: bytecode }])
+  }
 
   var renderOutputModifier = function (contractName, $contractOutput) {
-    var contract = data.contracts[contractName];
+    var contract = data.contracts[contractName]
     if (contract.bytecode) {
-      $contractOutput.append(uiHelper.textRow('Bytecode', contract.bytecode));
+      $contractOutput.append(uiHelper.textRow('Bytecode', contract.bytecode))
     }
 
-    $contractOutput.append(uiHelper.textRow('Interface', contract['interface']));
+    $contractOutput.append(uiHelper.textRow('Interface', contract['interface']))
 
     if (contract.bytecode) {
-      $contractOutput.append(uiHelper.textRow('Web3 deploy', uiHelper.gethDeploy(contractName.toLowerCase(), contract['interface'], contract.bytecode), 'deploy'));
-      $contractOutput.append(uiHelper.textRow('uDApp', combined(contractName, contract['interface'], contract.bytecode), 'deploy'));
+      $contractOutput.append(uiHelper.textRow('Web3 deploy', uiHelper.gethDeploy(contractName.toLowerCase(), contract['interface'], contract.bytecode), 'deploy'))
+      $contractOutput.append(uiHelper.textRow('uDApp', combined(contractName, contract['interface'], contract.bytecode), 'deploy'))
     }
-    var ctrSource = getSource(contractName, source, data);
-    return $contractOutput.append(uiHelper.getDetails(contract, ctrSource, contractName));
-  };
+    var ctrSource = getSource(contractName, source, data)
+    return $contractOutput.append(uiHelper.getDetails(contract, ctrSource, contractName))
+  }
   // //
-  var self = this;
+  var self = this
 
   var getSource = function (contractName, source, data) {
-    var currentFile = utils.fileNameFromKey(self.editor.getCacheFile());
-    return source.sources[currentFile];
-  };
+    var currentFile = utils.fileNameFromKey(self.editor.getCacheFile())
+    return source.sources[currentFile]
+  }
 
-  var getAddress = function () { return $('#txorigin').val(); };
+  var getAddress = function () { return $('#txorigin').val() }
 
   var getValue = function () {
-    var comp = $('#value').val().split(' ');
-    return self.executionContext.web3().toWei(comp[0], comp.slice(1).join(' '));
-  };
+    var comp = $('#value').val().split(' ')
+    return self.executionContext.web3().toWei(comp[0], comp.slice(1).join(' '))
+  }
 
-  var getGasLimit = function () { return $('#gasLimit').val(); };
+  var getGasLimit = function () { return $('#gasLimit').val() }
 
-  this.udapp.reset(udappContracts, getAddress, getValue, getGasLimit, renderOutputModifier);
+  this.udapp.reset(udappContracts, getAddress, getValue, getGasLimit, renderOutputModifier)
 
-  var $contractOutput = this.udapp.render();
+  var $contractOutput = this.udapp.render()
 
-  var $txOrigin = $('#txorigin');
+  var $txOrigin = $('#txorigin')
 
   this.udapp.getAccounts(function (err, accounts) {
     if (err) {
-      self.error(err.message);
+      self.error(err.message)
     }
     if (accounts && accounts[0]) {
-      $txOrigin.empty();
-      for (var a in accounts) { $txOrigin.append($('<option />').val(accounts[a]).text(accounts[a])); }
-      $txOrigin.val(accounts[0]);
+      $txOrigin.empty()
+      for (var a in accounts) { $txOrigin.append($('<option />').val(accounts[a]).text(accounts[a])) }
+      $txOrigin.val(accounts[0])
     } else {
-      $txOrigin.val('unknown');
+      $txOrigin.val('unknown')
     }
-  });
+  })
 
-  $contractOutput.find('.title').click(function (ev) { $(this).closest('.contract').toggleClass('hide'); });
-  $('#output').append($contractOutput);
-  $('.col2 input,textarea').click(function () { this.select(); });
-};
+  $contractOutput.find('.title').click(function (ev) { $(this).closest('.contract').toggleClass('hide') })
+  $('#output').append($contractOutput)
+  $('.col2 input,textarea').click(function () { this.select() })
+}
 
-module.exports = Renderer;
+module.exports = Renderer
diff --git a/src/app/storage.js b/src/app/storage.js
index 48a3d9d8ab..3f77d37206 100644
--- a/src/app/storage.js
+++ b/src/app/storage.js
@@ -1,98 +1,98 @@
 /* global chrome, confirm */
-'use strict';
+'use strict'
 
-var utils = require('./utils');
+var utils = require('./utils')
 
 function Storage (updateFiles) {
-  var EDITOR_SIZE_CACHE_KEY = 'editor-size-cache';
+  var EDITOR_SIZE_CACHE_KEY = 'editor-size-cache'
 
   this.rename = function (originalName, newName) {
-    var content = this.get(originalName);
-    this.set(newName, content);
-    this.remove(originalName);
-  };
+    var content = this.get(originalName)
+    this.set(newName, content)
+    this.remove(originalName)
+  }
 
   this.remove = function (name) {
-    window.localStorage.removeItem(name);
-  };
+    window.localStorage.removeItem(name)
+  }
 
   this.setEditorSize = function (size) {
-    this.set(EDITOR_SIZE_CACHE_KEY, size);
-  };
+    this.set(EDITOR_SIZE_CACHE_KEY, size)
+  }
 
   this.getEditorSize = function () {
-    return this.get(EDITOR_SIZE_CACHE_KEY);
-  };
+    return this.get(EDITOR_SIZE_CACHE_KEY)
+  }
 
   this.getFileContent = function (key) {
-    return this.get(utils.fileKey(key));
-  };
+    return this.get(utils.fileKey(key))
+  }
 
   this.exists = function (key) {
-    return !!this.get(key);
-  };
+    return !!this.get(key)
+  }
 
   this.set = function (key, content) {
-    window.localStorage.setItem(key, content);
-  };
+    window.localStorage.setItem(key, content)
+  }
 
   this.get = function (key) {
-    return window.localStorage.getItem(key);
-  };
+    return window.localStorage.getItem(key)
+  }
 
   this.keys = function () {
     // NOTE: this is a workaround for some browsers
-    return Object.keys(window.localStorage).filter(function (item) { return item !== null && item !== undefined; });
-  };
+    return Object.keys(window.localStorage).filter(function (item) { return item !== null && item !== undefined })
+  }
 
   this.loadFile = function (filename, content) {
     if (this.exists(filename) && this.get(filename) !== content) {
-      var count = '';
-      while (this.exists(filename + count)) count = count - 1;
-      this.rename(filename, filename + count);
+      var count = ''
+      while (this.exists(filename + count)) count = count - 1
+      this.rename(filename, filename + count)
     }
-    this.set(filename, content);
-  };
+    this.set(filename, content)
+  }
 
   this.sync = function () {
     if (typeof chrome === 'undefined' || !chrome || !chrome.storage || !chrome.storage.sync) {
-      return;
+      return
     }
 
-    var obj = {};
-    var done = false;
-    var count = 0;
+    var obj = {}
+    var done = false
+    var count = 0
 
     function check (key) {
       chrome.storage.sync.get(key, function (resp) {
-        console.log('comparing to cloud', key, resp);
+        console.log('comparing to cloud', key, resp)
         if (typeof resp[key] !== 'undefined' && obj[key] !== resp[key] && confirm('Overwrite "' + utils.fileNameFromKey(key) + '"? Click Ok to overwrite local file with file from cloud. Cancel will push your local file to the cloud.')) {
-          console.log('Overwriting', key);
-          window.localStorage.setItem(key, resp[key]);
-          updateFiles();
+          console.log('Overwriting', key)
+          window.localStorage.setItem(key, resp[key])
+          updateFiles()
         } else {
-          console.log('add to obj', obj, key);
-          obj[key] = window.localStorage[key];
+          console.log('add to obj', obj, key)
+          obj[key] = window.localStorage[key]
         }
-        done++;
+        done++
         if (done >= count) {
           chrome.storage.sync.set(obj, function () {
-            console.log('updated cloud files with: ', obj, this, arguments);
-          });
+            console.log('updated cloud files with: ', obj, this, arguments)
+          })
         }
-      });
+      })
     }
 
     for (var y in window.localStorage) {
-      console.log('checking', y);
-      obj[y] = window.localStorage.getItem(y);
+      console.log('checking', y)
+      obj[y] = window.localStorage.getItem(y)
       if (!utils.isCachedFile(y)) {
-        continue;
+        continue
       }
-      count++;
-      check(y);
+      count++
+      check(y)
     }
-  };
+  }
 }
 
-module.exports = Storage;
+module.exports = Storage
diff --git a/src/app/ui-helper.js b/src/app/ui-helper.js
index 95794a8d6c..7b1cf8a8df 100644
--- a/src/app/ui-helper.js
+++ b/src/app/ui-helper.js
@@ -1,79 +1,79 @@
-'use strict';
+'use strict'
 
-var $ = require('jquery');
+var $ = require('jquery')
 
 module.exports = {
   tableRowItems: function (first, second, cls) {
     return $('<div class="crow"/>')
       .addClass(cls)
       .append($('<div class="col1">').append(first))
-      .append($('<div class="col2">').append(second));
+      .append($('<div class="col2">').append(second))
   },
 
   tableRow: function (description, data) {
     return this.tableRowItems(
       $('<span/>').text(description),
-      $('<input readonly="readonly"/>').val(data));
+      $('<input readonly="readonly"/>').val(data))
   },
 
   textRow: function (description, data, cls) {
     return this.tableRowItems(
       $('<strong/>').text(description),
       $('<textarea readonly="readonly" class="gethDeployText"/>').val(data),
-      cls);
+      cls)
   },
 
   preRow: function (description, data) {
     return this.tableRowItems(
       $('<span/>').text(description),
       $('<pre/>').text(data)
-    );
+    )
   },
 
   formatAssemblyText: function (asm, prefix, source) {
-    var self = this;
+    var self = this
     if (typeof asm === typeof '' || asm === null || asm === undefined) {
-      return prefix + asm + '\n';
+      return prefix + asm + '\n'
     }
-    var text = prefix + '.code\n';
+    var text = prefix + '.code\n'
     $.each(asm['.code'], function (i, item) {
-      var v = item.value === undefined ? '' : item.value;
-      var src = '';
+      var v = item.value === undefined ? '' : item.value
+      var src = ''
       if (item.begin !== undefined && item.end !== undefined) {
-        src = source.slice(item.begin, item.end).replace('\n', '\\n', 'g');
+        src = source.slice(item.begin, item.end).replace('\n', '\\n', 'g')
       }
       if (src.length > 30) {
-        src = src.slice(0, 30) + '...';
+        src = src.slice(0, 30) + '...'
       }
       if (item.name !== 'tag') {
-        text += '  ';
+        text += '  '
       }
-      text += prefix + item.name + ' ' + v + '\t\t\t' + src + '\n';
-    });
-    text += prefix + '.data\n';
+      text += prefix + item.name + ' ' + v + '\t\t\t' + src + '\n'
+    })
+    text += prefix + '.data\n'
     if (asm['.data']) {
       $.each(asm['.data'], function (i, item) {
-        text += '  ' + prefix + '' + i + ':\n';
-        text += self.formatAssemblyText(item, prefix + '    ', source);
-      });
+        text += '  ' + prefix + '' + i + ':\n'
+        text += self.formatAssemblyText(item, prefix + '    ', source)
+      })
     }
-    return text;
+    return text
   },
 
   gethDeploy: function (contractName, jsonInterface, bytecode) {
-    var code = '';
-    var funABI = this.getConstructorInterface(JSON.parse(jsonInterface));
+    var code = ''
+    var funABI = this.getConstructorInterface(JSON.parse(jsonInterface))
 
     funABI.inputs.forEach(function (inp) {
-      code += 'var ' + inp.name + ' = /* var of type ' + inp.type + ' here */ ;\n';
-    });
+      code += 'var ' + inp.name + ' = /* var of type ' + inp.type + ' here */ ;\n'
+    })
 
     code += 'var ' + contractName + 'Contract = web3.eth.contract(' + jsonInterface.replace('\n', '') + ');' +
-      '\nvar ' + contractName + ' = ' + contractName + 'Contract.new(';
+      '\nvar ' + contractName + ' = ' + contractName + 'Contract.new('
 
     funABI.inputs.forEach(function (inp) {
-      code += '\n   ' + inp.name + ',';
-    });
+      code += '\n   ' + inp.name + ','
+    })
 
     code += '\n   {' +
       '\n     from: web3.eth.accounts[0], ' +
@@ -84,90 +84,90 @@ module.exports = {
       "\n    if (typeof contract.address !== 'undefined') {" +
       "\n         console.log('Contract mined! address: ' + contract.address + ' transactionHash: ' + contract.transactionHash);" +
       '\n    }' +
-      '\n })';
+      '\n })'
 
-    return code;
+    return code
   },
 
   getConstructorInterface: function (abi) {
-    var funABI = { 'name': '', 'inputs': [], 'type': 'constructor', 'outputs': [] };
+    var funABI = { 'name': '', 'inputs': [], 'type': 'constructor', 'outputs': [] }
     for (var i = 0; i < abi.length; i++) {
       if (abi[i].type === 'constructor') {
-        funABI.inputs = abi[i].inputs || [];
-        break;
+        funABI.inputs = abi[i].inputs || []
+        break
       }
     }
-    return funABI;
+    return funABI
   },
 
   formatGasEstimates: function (data) {
     // FIXME: the whole gasEstimates object should be nil instead
     if (data.creation === undefined && data.external === undefined && data.internal === undefined) {
-      return;
+      return
     }
 
     var gasToText = function (g) {
-      return g === null ? 'unknown' : g;
-    };
+      return g === null ? 'unknown' : g
+    }
 
-    var text = '';
-    var fun;
+    var text = ''
+    var fun
     if ('creation' in data) {
-      text += 'Creation: ' + gasToText(data.creation[0]) + ' + ' + gasToText(data.creation[1]) + '\n';
+      text += 'Creation: ' + gasToText(data.creation[0]) + ' + ' + gasToText(data.creation[1]) + '\n'
     }
 
     if ('external' in data) {
-      text += 'External:\n';
+      text += 'External:\n'
       for (fun in data.external) {
-        text += '  ' + fun + ': ' + gasToText(data.external[fun]) + '\n';
+        text += '  ' + fun + ': ' + gasToText(data.external[fun]) + '\n'
       }
     }
 
     if ('internal' in data) {
-      text += 'Internal:\n';
+      text += 'Internal:\n'
       for (fun in data.internal) {
-        text += '  ' + fun + ': ' + gasToText(data.internal[fun]) + '\n';
+        text += '  ' + fun + ': ' + gasToText(data.internal[fun]) + '\n'
       }
     }
-    return text;
+    return text
   },
 
   detailsOpen: {},
   getDetails: function (contract, source, contractName) {
-    var button = $('<button>Toggle Details</button>');
-    var details = $('<div style="display: none;"/>');
+    var button = $('<button>Toggle Details</button>')
+    var details = $('<div style="display: none;"/>')
 
-    var funHashes = '';
+    var funHashes = ''
     for (var fun in contract.functionHashes) {
-      funHashes += contract.functionHashes[fun] + ' ' + fun + '\n';
+      funHashes += contract.functionHashes[fun] + ' ' + fun + '\n'
     }
-    details.append(this.preRow('Functions', funHashes));
+    details.append(this.preRow('Functions', funHashes))
 
-    var gasEstimates = this.formatGasEstimates(contract.gasEstimates);
+    var gasEstimates = this.formatGasEstimates(contract.gasEstimates)
     if (gasEstimates) {
-      details.append(this.preRow('Gas Estimates', gasEstimates));
+      details.append(this.preRow('Gas Estimates', gasEstimates))
     }
 
     if (contract.runtimeBytecode && contract.runtimeBytecode.length > 0) {
-      details.append(this.tableRow('Runtime Bytecode', contract.runtimeBytecode));
+      details.append(this.tableRow('Runtime Bytecode', contract.runtimeBytecode))
     }
 
     if (contract.opcodes !== undefined && contract.opcodes !== '') {
-      details.append(this.tableRow('Opcodes', contract.opcodes));
+      details.append(this.tableRow('Opcodes', contract.opcodes))
     }
 
     if (contract.assembly !== null) {
-      details.append(this.preRow('Assembly', this.formatAssemblyText(contract.assembly, '', source)));
+      details.append(this.preRow('Assembly', this.formatAssemblyText(contract.assembly, '', source)))
     }
 
-    var self = this;
+    var self = this
     button.click(function () {
-      self.detailsOpen[contractName] = !self.detailsOpen[contractName];
-      details.toggle();
-    });
+      self.detailsOpen[contractName] = !self.detailsOpen[contractName]
+      details.toggle()
+    })
     if (this.detailsOpen[contractName]) {
-      details.show();
+      details.show()
     }
-    return $('<div class="contractDetails"/>').append(button).append(details);
+    return $('<div class="contractDetails"/>').append(button).append(details)
   }
-};
+}
diff --git a/src/app/utils.js b/src/app/utils.js
index 14d025eab6..4189a2b89d 100644
--- a/src/app/utils.js
+++ b/src/app/utils.js
@@ -1,25 +1,25 @@
-'use strict';
+'use strict'
 
-var SOL_CACHE_FILE_PREFIX = 'sol-cache-file-';
+var SOL_CACHE_FILE_PREFIX = 'sol-cache-file-'
 
 function getCacheFilePrefix () {
-  return SOL_CACHE_FILE_PREFIX;
+  return SOL_CACHE_FILE_PREFIX
 }
 
 function isCachedFile (name) {
-  return name.indexOf(getCacheFilePrefix(), 0) === 0;
+  return name.indexOf(getCacheFilePrefix(), 0) === 0
 }
 
 function fileKey (name) {
-  return getCacheFilePrefix() + name;
+  return getCacheFilePrefix() + name
 }
 
 function fileNameFromKey (key) {
-  return key.replace(getCacheFilePrefix(), '');
+  return key.replace(getCacheFilePrefix(), '')
 }
 
 function errortype (message) {
-  return message.match(/^.*:[0-9]*:[0-9]* Warning: /) ? 'warning' : 'error';
+  return message.match(/^.*:[0-9]*:[0-9]* Warning: /) ? 'warning' : 'error'
 }
 
 module.exports = {
@@ -27,4 +27,4 @@ module.exports = {
   fileKey: fileKey,
   fileNameFromKey: fileNameFromKey,
   errortype: errortype
-};
+}
diff --git a/src/index.js b/src/index.js
index c9d00e4526..7bae8553c5 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,7 +1,7 @@
-'use strict';
+'use strict'
 
-require('es6-shim');
-var app = require('./app.js');
-var $ = require('jquery');
+require('es6-shim')
+var app = require('./app.js')
+var $ = require('jquery')
 
-$(document).ready(function () { app.run(); });
+$(document).ready(function () { app.run() })
diff --git a/src/lib/eventManager.js b/src/lib/eventManager.js
index 16f96c8dc6..8a5839effb 100644
--- a/src/lib/eventManager.js
+++ b/src/lib/eventManager.js
@@ -1,7 +1,7 @@
-'use strict';
+'use strict'
 
 function eventManager () {
-  this.registered = {};
+  this.registered = {}
 }
 
 /*
@@ -14,17 +14,17 @@ function eventManager () {
 */
 eventManager.prototype.unregister = function (eventName, obj, func) {
   if (obj instanceof Function) {
-    func = obj;
-    obj = {};
+    func = obj
+    obj = {}
   }
   for (var reg in this.registered[eventName]) {
     if (this.registered[eventName][reg] &&
       this.registered[eventName][reg].obj === obj && (!func || this.registered[eventName][reg].func === func)) {
-      this.registered[eventName].splice(reg, 1);
-      return;
+      this.registered[eventName].splice(reg, 1)
+      return
     }
   }
-};
+}
 
 /*
    * Register a new listenner.
@@ -36,17 +36,17 @@ eventManager.prototype.unregister = function (eventName, obj, func) {
 */
 eventManager.prototype.register = function (eventName, obj, func) {
   if (!this.registered[eventName]) {
-    this.registered[eventName] = [];
+    this.registered[eventName] = []
   }
   if (obj instanceof Function) {
-    func = obj;
-    obj = {};
+    func = obj
+    obj = {}
   }
   this.registered[eventName].push({
     obj: obj,
     func: func
-  });
-};
+  })
+}
 
 /*
    * trigger event.
@@ -57,9 +57,9 @@ eventManager.prototype.register = function (eventName, obj, func) {
 */
 eventManager.prototype.trigger = function (eventName, args) {
   for (var listener in this.registered[eventName]) {
-    var l = this.registered[eventName][listener];
-    l.func.apply(l.obj, args);
+    var l = this.registered[eventName][listener]
+    l.func.apply(l.obj, args)
   }
-};
+}
 
-module.exports = eventManager;
+module.exports = eventManager
diff --git a/src/universal-dapp.js b/src/universal-dapp.js
index 84b93f8a99..48be034e99 100644
--- a/src/universal-dapp.js
+++ b/src/universal-dapp.js
@@ -1,508 +1,508 @@
 /* global prompt */
-'use strict';
+'use strict'
 
-var $ = require('jquery');
-var ethJSUtil = require('ethereumjs-util');
-var EthJSTX = require('ethereumjs-tx');
-var ethJSABI = require('ethereumjs-abi');
-var EthJSBlock = require('ethereumjs-block');
-var BN = ethJSUtil.BN;
-var EventManager = require('./lib/eventManager');
-var crypto = require('crypto');
+var $ = require('jquery')
+var ethJSUtil = require('ethereumjs-util')
+var EthJSTX = require('ethereumjs-tx')
+var ethJSABI = require('ethereumjs-abi')
+var EthJSBlock = require('ethereumjs-block')
+var BN = ethJSUtil.BN
+var EventManager = require('./lib/eventManager')
+var crypto = require('crypto')
 
 /*
   trigger debugRequested
 */
 function UniversalDApp (executionContext, options, txdebugger) {
-  this.event = new EventManager();
-  var self = this;
-
-  self.options = options || {};
-  self.$el = $('<div class="udapp" />');
-  self.personalMode = self.options.personalMode || false;
-  self.contracts;
-  self.getAddress;
-  self.getValue;
-  self.getGasLimit;
-  self.txdebugger = txdebugger; // temporary: will not be needed anymore when we'll add memory support to the VM
-  var defaultRenderOutputModifier = function (name, content) { return content; };
-  self.renderOutputModifier = defaultRenderOutputModifier;
-  self.web3 = executionContext.web3();
-  self.vm = executionContext.vm();
-  self.executionContext = executionContext;
+  this.event = new EventManager()
+  var self = this
+
+  self.options = options || {}
+  self.$el = $('<div class="udapp" />')
+  self.personalMode = self.options.personalMode || false
+  self.contracts
+  self.getAddress
+  self.getValue
+  self.getGasLimit
+  self.txdebugger = txdebugger // temporary: will not be needed anymore when we'll add memory support to the VM
+  var defaultRenderOutputModifier = function (name, content) { return content }
+  self.renderOutputModifier = defaultRenderOutputModifier
+  self.web3 = executionContext.web3()
+  self.vm = executionContext.vm()
+  self.executionContext = executionContext
   self.executionContext.event.register('contextChanged', this, function (context) {
-    self.reset(self.contracts);
-  });
+    self.reset(self.contracts)
+  })
 }
 
 UniversalDApp.prototype.reset = function (contracts, getAddress, getValue, getGasLimit, renderer) {
-  this.$el.empty();
-  this.contracts = contracts;
-  this.getAddress = getAddress;
-  this.getValue = getValue;
-  this.getGasLimit = getGasLimit;
-  this.renderOutputModifier = renderer;
-  this.accounts = {};
+  this.$el.empty()
+  this.contracts = contracts
+  this.getAddress = getAddress
+  this.getValue = getValue
+  this.getGasLimit = getGasLimit
+  this.renderOutputModifier = renderer
+  this.accounts = {}
   if (this.executionContext.isVM()) {
-    this._addAccount('3cd7232cd6f3fc66a57a6bedc1a8ed6c228fff0a327e169c2bcc5e869ed49511');
-    this._addAccount('2ac6c190b09897cd8987869cc7b918cfea07ee82038d492abce033c75c1b1d0c');
-    this._addAccount('dae9801649ba2d95a21e688b56f77905e5667c44ce868ec83f82e838712a2c7a');
-    this._addAccount('d74aa6d18aa79a05f3473dd030a97d3305737cbc8337d940344345c1f6b72eea');
-    this._addAccount('71975fbf7fe448e004ac7ae54cad0a383c3906055a65468714156a07385e96ce');
-    this.blockNumber = 1150000; // The VM is running in Homestead mode, which started at this block.
+    this._addAccount('3cd7232cd6f3fc66a57a6bedc1a8ed6c228fff0a327e169c2bcc5e869ed49511')
+    this._addAccount('2ac6c190b09897cd8987869cc7b918cfea07ee82038d492abce033c75c1b1d0c')
+    this._addAccount('dae9801649ba2d95a21e688b56f77905e5667c44ce868ec83f82e838712a2c7a')
+    this._addAccount('d74aa6d18aa79a05f3473dd030a97d3305737cbc8337d940344345c1f6b72eea')
+    this._addAccount('71975fbf7fe448e004ac7ae54cad0a383c3906055a65468714156a07385e96ce')
+    this.blockNumber = 1150000 // The VM is running in Homestead mode, which started at this block.
   }
-};
+}
 
 UniversalDApp.prototype.newAccount = function (password) {
   if (!this.executionContext.isVM()) {
     if (!this.personalMode) {
-      throw new Error('Not running in personal mode');
+      throw new Error('Not running in personal mode')
     }
-    this.web3.personal.newAccount(password);
+    this.web3.personal.newAccount(password)
   } else {
-    var privateKey;
+    var privateKey
     do {
-      privateKey = crypto.randomBytes(32);
-    } while (!ethJSUtil.isValidPrivate(privateKey));
-    this._addAccount(privateKey);
+      privateKey = crypto.randomBytes(32)
+    } while (!ethJSUtil.isValidPrivate(privateKey))
+    this._addAccount(privateKey)
   }
-};
+}
 
 UniversalDApp.prototype._addAccount = function (privateKey, balance) {
-  var self = this;
+  var self = this
 
   if (!self.executionContext.isVM()) {
-    throw new Error('_addAccount() cannot be called in non-VM mode');
+    throw new Error('_addAccount() cannot be called in non-VM mode')
   }
 
   if (self.accounts) {
-    privateKey = new Buffer(privateKey, 'hex');
-    var address = ethJSUtil.privateToAddress(privateKey);
+    privateKey = new Buffer(privateKey, 'hex')
+    var address = ethJSUtil.privateToAddress(privateKey)
 
     // FIXME: we don't care about the callback, but we should still make this proper
-    self.vm.stateManager.putAccountBalance(address, balance || 'f00000000000000001', function cb () {});
+    self.vm.stateManager.putAccountBalance(address, balance || 'f00000000000000001', function cb () {})
 
-    self.accounts['0x' + address.toString('hex')] = { privateKey: privateKey, nonce: 0 };
+    self.accounts['0x' + address.toString('hex')] = { privateKey: privateKey, nonce: 0 }
   }
-};
+}
 
 UniversalDApp.prototype.getAccounts = function (cb) {
-  var self = this;
+  var self = this
 
   if (!self.executionContext.isVM()) {
     // Weirdness of web3: listAccounts() is sync, `getListAccounts()` is async
     // See: https://github.com/ethereum/web3.js/issues/442
     if (self.personalMode) {
-      self.web3.personal.getListAccounts(cb);
+      self.web3.personal.getListAccounts(cb)
     } else {
-      self.web3.eth.getAccounts(cb);
+      self.web3.eth.getAccounts(cb)
     }
   } else {
     if (!self.accounts) {
-      return cb('No accounts?');
+      return cb('No accounts?')
     }
 
-    cb(null, Object.keys(self.accounts));
+    cb(null, Object.keys(self.accounts))
   }
-};
+}
 
 UniversalDApp.prototype.getBalance = function (address, cb) {
-  var self = this;
+  var self = this
 
-  address = ethJSUtil.stripHexPrefix(address);
+  address = ethJSUtil.stripHexPrefix(address)
 
   if (!self.executionContext.isVM()) {
     self.web3.eth.getBalance(address, function (err, res) {
       if (err) {
-        cb(err);
+        cb(err)
       } else {
-        cb(null, res.toString(10));
+        cb(null, res.toString(10))
       }
-    });
+    })
   } else {
     if (!self.accounts) {
-      return cb('No accounts?');
+      return cb('No accounts?')
     }
 
     self.vm.stateManager.getAccountBalance(new Buffer(address, 'hex'), function (err, res) {
       if (err) {
-        cb('Account not found');
+        cb('Account not found')
       } else {
-        cb(null, new BN(res).toString(10));
+        cb(null, new BN(res).toString(10))
       }
-    });
+    })
   }
-};
+}
 
 UniversalDApp.prototype.render = function () {
-  var self = this;
+  var self = this
 
   // NOTE: don't display anything if there are no contracts to display
   if (self.contracts.length === 0) {
-    return self.$el;
+    return self.$el
   }
 
   var $legend = $('<div class="legend" />')
     .append($('<div class="attach"/>').text('Attach'))
     .append($('<div class="transact"/>').text('Transact'))
-    .append($('<div class="call"/>').text('Call'));
+    .append($('<div class="call"/>').text('Call'))
 
-  self.$el.append($legend);
+  self.$el.append($legend)
 
   for (var c in self.contracts) {
-    var $contractEl = $('<div class="contract"/>');
+    var $contractEl = $('<div class="contract"/>')
 
     if (self.contracts[c].address) {
-      self.getInstanceInterface(self.contracts[c], self.contracts[c].address, $contractEl);
+      self.getInstanceInterface(self.contracts[c], self.contracts[c].address, $contractEl)
     } else {
-      var $title = $('<span class="title"/>').text(self.contracts[c].name);
+      var $title = $('<span class="title"/>').text(self.contracts[c].name)
       if (self.contracts[c].bytecode) {
-        $title.append($('<div class="size"/>').text((self.contracts[c].bytecode.length / 2) + ' bytes'));
+        $title.append($('<div class="size"/>').text((self.contracts[c].bytecode.length / 2) + ' bytes'))
       }
-      $contractEl.append($title).append(self.getCreateInterface($contractEl, self.contracts[c]));
+      $contractEl.append($title).append(self.getCreateInterface($contractEl, self.contracts[c]))
     }
-    self.$el.append(self.renderOutputModifier(self.contracts[c].name, $contractEl));
+    self.$el.append(self.renderOutputModifier(self.contracts[c].name, $contractEl))
   }
 
-  return self.$el;
-};
+  return self.$el
+}
 
 UniversalDApp.prototype.getContractByName = function (contractName) {
-  var self = this;
+  var self = this
   for (var c in self.contracts) {
     if (self.contracts[c].name === contractName) {
-      return self.contracts[c];
+      return self.contracts[c]
     }
   }
-  return null;
-};
+  return null
+}
 
 UniversalDApp.prototype.getCreateInterface = function ($container, contract) {
-  var self = this;
-  var $createInterface = $('<div class="create"/>');
+  var self = this
+  var $createInterface = $('<div class="create"/>')
   if (self.options.removable) {
-    var $close = $('<div class="udapp-close" />');
-    $close.click(function () { self.$el.remove(); });
-    $createInterface.append($close);
+    var $close = $('<div class="udapp-close" />')
+    $close.click(function () { self.$el.remove() })
+    $createInterface.append($close)
   }
-  var $atButton = $('<button class="atAddress"/>').text('At Address').click(function () { self.clickContractAt(self, $container.find('.createContract'), contract); });
-  $createInterface.append($atButton);
+  var $atButton = $('<button class="atAddress"/>').text('At Address').click(function () { self.clickContractAt(self, $container.find('.createContract'), contract) })
+  $createInterface.append($atButton)
 
-  var $newButton = self.getInstanceInterface(contract);
-  $createInterface.append($newButton);
+  var $newButton = self.getInstanceInterface(contract)
+  $createInterface.append($newButton)
 
   // Only display creation interface for non-abstract contracts.
   // FIXME: maybe have a flag for this in the JSON?
   // FIXME: maybe fix getInstanceInterface() below for this case
   if (contract.bytecode.length === 0) {
-    var $createButton = $newButton.find('.constructor .call');
+    var $createButton = $newButton.find('.constructor .call')
 
     // NOTE: we must show the button to have CSS properly lined up
-    $createButton.text('Create');
-    $createButton.attr('disabled', 'disabled');
-    $createButton.attr('title', 'This contract does not implement all functions and thus cannot be created.');
+    $createButton.text('Create')
+    $createButton.attr('disabled', 'disabled')
+    $createButton.attr('title', 'This contract does not implement all functions and thus cannot be created.')
   }
 
-  return $createInterface;
-};
+  return $createInterface
+}
 
 UniversalDApp.prototype.getInstanceInterface = function (contract, address, $target) {
-  var self = this;
+  var self = this
   var abi = JSON.parse(contract.interface).sort(function (a, b) {
     if (a.name > b.name) {
-      return -1;
+      return -1
     } else {
-      return 1;
+      return 1
     }
   }).sort(function (a, b) {
     if (a.constant === true) {
-      return -1;
+      return -1
     } else {
-      return 1;
+      return 1
     }
-  });
-  var funABI = self.getConstructorInterface(abi);
-  var $createInterface = $('<div class="createContract"/>');
+  })
+  var funABI = self.getConstructorInterface(abi)
+  var $createInterface = $('<div class="createContract"/>')
 
   var appendFunctions = function (address, $el) {
-    var $instance = $('<div class="instance"/>');
+    var $instance = $('<div class="instance"/>')
     if (self.options.removable_instances) {
-      var $close = $('<div class="udapp-close" />');
-      $close.click(function () { $instance.remove(); });
-      $instance.append($close);
+      var $close = $('<div class="udapp-close" />')
+      $close.click(function () { $instance.remove() })
+      $instance.append($close)
     }
-    var context = self.executionContext.isVM() ? 'memory' : 'blockchain';
+    var context = self.executionContext.isVM() ? 'memory' : 'blockchain'
 
-    address = (address.slice(0, 2) === '0x' ? '' : '0x') + address.toString('hex');
-    var $title = $('<span class="title"/>').text(contract.name + ' at ' + address + ' (' + context + ')');
+    address = (address.slice(0, 2) === '0x' ? '' : '0x') + address.toString('hex')
+    var $title = $('<span class="title"/>').text(contract.name + ' at ' + address + ' (' + context + ')')
     $title.click(function () {
-      $instance.toggleClass('hide');
-    });
+      $instance.toggleClass('hide')
+    })
 
-    var $events = $('<div class="events"/>');
+    var $events = $('<div class="events"/>')
 
     var parseLogs = function (err, response) {
       if (err) {
-        return;
+        return
       }
 
-      var $event = $('<div class="event" />');
+      var $event = $('<div class="event" />')
 
-      var $close = $('<div class="udapp-close" />');
-      $close.click(function () { $event.remove(); });
+      var $close = $('<div class="udapp-close" />')
+      $close.click(function () { $event.remove() })
 
       $event.append($('<span class="name"/>').text(response.event))
         .append($('<span class="args" />').text(JSON.stringify(response.args, null, 2)))
-        .append($close);
+        .append($close)
 
-      $events.append($event);
-    };
+      $events.append($event)
+    }
 
     if (self.executionContext.isVM()) {
       // FIXME: support indexed events
-      var eventABI = {};
+      var eventABI = {}
 
       $.each(abi, function (i, funABI) {
         if (funABI.type !== 'event') {
-          return;
+          return
         }
 
-        var hash = ethJSABI.eventID(funABI.name, funABI.inputs.map(function (item) { return item.type; }));
-        eventABI[hash.toString('hex')] = { event: funABI.name, inputs: funABI.inputs };
-      });
+        var hash = ethJSABI.eventID(funABI.name, funABI.inputs.map(function (item) { return item.type }))
+        eventABI[hash.toString('hex')] = { event: funABI.name, inputs: funABI.inputs }
+      })
 
       self.vm.on('afterTx', function (response) {
         for (var i in response.vm.logs) {
           // [address, topics, mem]
-          var log = response.vm.logs[i];
-          var event;
-          var decoded;
+          var log = response.vm.logs[i]
+          var event
+          var decoded
 
           try {
-            var abi = eventABI[log[1][0].toString('hex')];
-            event = abi.event;
+            var abi = eventABI[log[1][0].toString('hex')]
+            event = abi.event
             var types = abi.inputs.map(function (item) {
-              return item.type;
-            });
-            decoded = ethJSABI.rawDecode(types, log[2]);
-            decoded = ethJSABI.stringify(types, decoded);
+              return item.type
+            })
+            decoded = ethJSABI.rawDecode(types, log[2])
+            decoded = ethJSABI.stringify(types, decoded)
           } catch (e) {
-            decoded = '0x' + log[2].toString('hex');
+            decoded = '0x' + log[2].toString('hex')
           }
 
-          parseLogs(null, { event: event, args: decoded });
+          parseLogs(null, { event: event, args: decoded })
         }
-      });
+      })
     } else {
-      var eventFilter = self.web3.eth.contract(abi).at(address).allEvents();
-      eventFilter.watch(parseLogs);
+      var eventFilter = self.web3.eth.contract(abi).at(address).allEvents()
+      eventFilter.watch(parseLogs)
     }
-    $instance.append($title);
+    $instance.append($title)
 
     // Add the fallback function
     $instance.append(self.getCallButton({
       abi: { constant: false, inputs: [], name: '(fallback)', outputs: [], type: 'function' },
       encode: function (args) {
-        return '';
+        return ''
       },
       address: address
-    }));
+    }))
 
     $.each(abi, function (i, funABI) {
       if (funABI.type !== 'function') {
-        return;
+        return
       }
       // @todo getData cannot be used with overloaded functions
       $instance.append(self.getCallButton({
         abi: funABI,
         encode: function (args) {
-          var types = [];
+          var types = []
           for (var i = 0; i < funABI.inputs.length; i++) {
-            types.push(funABI.inputs[i].type);
+            types.push(funABI.inputs[i].type)
           }
 
-          return Buffer.concat([ ethJSABI.methodID(funABI.name, types), ethJSABI.rawEncode(types, args) ]).toString('hex');
+          return Buffer.concat([ ethJSABI.methodID(funABI.name, types), ethJSABI.rawEncode(types, args) ]).toString('hex')
         },
         address: address
-      }));
-    });
-    ($el || $createInterface).append($instance.append($events));
-  };
+      }))
+    })
+    ($el || $createInterface).append($instance.append($events))
+  }
 
   if (!address || !$target) {
     $createInterface.append(self.getCallButton({
       abi: funABI,
       encode: function (args) {
-        var types = [];
+        var types = []
         for (var i = 0; i < funABI.inputs.length; i++) {
-          types.push(funABI.inputs[i].type);
+          types.push(funABI.inputs[i].type)
         }
 
         // NOTE: the caller will concatenate the bytecode and this
         //       it could be done here too for consistency
-        return ethJSABI.rawEncode(types, args).toString('hex');
+        return ethJSABI.rawEncode(types, args).toString('hex')
       },
       contractName: contract.name,
       bytecode: contract.bytecode,
       appendFunctions: appendFunctions
-    }));
+    }))
   } else {
-    appendFunctions(address, $target);
+    appendFunctions(address, $target)
   }
 
-  return $createInterface;
-};
+  return $createInterface
+}
 
 // either return the supplied constructor or a mockup (we assume everything can be instantiated)
 UniversalDApp.prototype.getConstructorInterface = function (abi) {
-  var funABI = { 'name': '', 'inputs': [], 'type': 'constructor', 'outputs': [] };
+  var funABI = { 'name': '', 'inputs': [], 'type': 'constructor', 'outputs': [] }
   for (var i = 0; i < abi.length; i++) {
     if (abi[i].type === 'constructor') {
-      funABI.inputs = abi[i].inputs || [];
-      break;
+      funABI.inputs = abi[i].inputs || []
+      break
     }
   }
-  return funABI;
-};
+  return funABI
+}
 
 UniversalDApp.prototype.getCallButton = function (args) {
-  var self = this;
+  var self = this
   // args.abi, args.encode, args.bytecode [constr only], args.address [fun only]
   // args.contractName [constr only], args.appendFunctions [constr only]
-  var isConstructor = args.bytecode !== undefined;
-  var lookupOnly = (args.abi.constant && !isConstructor);
+  var isConstructor = args.bytecode !== undefined
+  var lookupOnly = (args.abi.constant && !isConstructor)
 
-  var inputs = '';
+  var inputs = ''
   $.each(args.abi.inputs, function (i, inp) {
     if (inputs !== '') {
-      inputs += ', ';
+      inputs += ', '
     }
-    inputs += inp.type + ' ' + inp.name;
-  });
-  var inputField = $('<input/>').attr('placeholder', inputs).attr('title', inputs);
-  var $outputOverride = $('<div class="value" />');
-  var outputSpan = $('<div class="output"/>');
+    inputs += inp.type + ' ' + inp.name
+  })
+  var inputField = $('<input/>').attr('placeholder', inputs).attr('title', inputs)
+  var $outputOverride = $('<div class="value" />')
+  var outputSpan = $('<div class="output"/>')
 
   var getReturnOutput = function (result) {
-    var returnName = lookupOnly ? 'Value' : 'Result';
-    var returnCls = lookupOnly ? 'value' : 'returned';
-    return $('<div class="' + returnCls + '">').html('<strong>' + returnName + ':</strong> ' + JSON.stringify(result, null, 2));
-  };
+    var returnName = lookupOnly ? 'Value' : 'Result'
+    var returnCls = lookupOnly ? 'value' : 'returned'
+    return $('<div class="' + returnCls + '">').html('<strong>' + returnName + ':</strong> ' + JSON.stringify(result, null, 2))
+  }
 
   var getDebugTransaction = function (result) {
-    var $debugTx = $('<div class="debugTx">');
-    var $button = $('<button title="Launch Debugger" class="debug"><i class="fa fa-bug"></i></button>');
+    var $debugTx = $('<div class="debugTx">')
+    var $button = $('<button title="Launch Debugger" class="debug"><i class="fa fa-bug"></i></button>')
     $button.click(function () {
-      self.event.trigger('debugRequested', [result]);
-    });
-    $debugTx.append($button);
-    return $debugTx;
-  };
+      self.event.trigger('debugRequested', [result])
+    })
+    $debugTx.append($button)
+    return $debugTx
+  }
 
   var getDebugCall = function (result) {
-    var $debugTx = $('<div class="debugCall">');
-    var $button = $('<button title="Launch Debugger" class="debug"><i class="fa fa-bug"></i></button>');
+    var $debugTx = $('<div class="debugCall">')
+    var $button = $('<button title="Launch Debugger" class="debug"><i class="fa fa-bug"></i></button>')
     $button.click(function () {
-      self.event.trigger('debugRequested', [result]);
-    });
-    $debugTx.append($button);
-    return $debugTx;
-  };
+      self.event.trigger('debugRequested', [result])
+    })
+    $debugTx.append($button)
+    return $debugTx
+  }
 
   var getGasUsedOutput = function (result, vmResult) {
-    var $gasUsed = $('<div class="gasUsed">');
-    var caveat = lookupOnly ? '<em>(<span class="caveat" title="Cost only applies when called by a contract">caveat</span>)</em>' : '';
-    var gas;
+    var $gasUsed = $('<div class="gasUsed">')
+    var caveat = lookupOnly ? '<em>(<span class="caveat" title="Cost only applies when called by a contract">caveat</span>)</em>' : ''
+    var gas
     if (result.gasUsed) {
-      gas = result.gasUsed.toString(10);
-      $gasUsed.html('<strong>Transaction cost:</strong> ' + gas + ' gas. ' + caveat);
+      gas = result.gasUsed.toString(10)
+      $gasUsed.html('<strong>Transaction cost:</strong> ' + gas + ' gas. ' + caveat)
     }
     if (vmResult && vmResult.gasUsed) {
-      var $callGasUsed = $('<div class="gasUsed">');
-      gas = vmResult.gasUsed.toString(10);
-      $callGasUsed.append('<strong>Execution cost:</strong> ' + gas + ' gas.');
-      $gasUsed.append($callGasUsed);
+      var $callGasUsed = $('<div class="gasUsed">')
+      gas = vmResult.gasUsed.toString(10)
+      $callGasUsed.append('<strong>Execution cost:</strong> ' + gas + ' gas.')
+      $gasUsed.append($callGasUsed)
     }
-    return $gasUsed;
-  };
+    return $gasUsed
+  }
 
   var getDecodedOutput = function (result) {
-    var $decoded;
+    var $decoded
     if (Array.isArray(result)) {
-      $decoded = $('<ol>');
+      $decoded = $('<ol>')
       for (var i = 0; i < result.length; i++) {
-        $decoded.append($('<li>').text(result[i]));
+        $decoded.append($('<li>').text(result[i]))
       }
     } else {
-      $decoded = result;
+      $decoded = result
     }
-    return $('<div class="decoded">').html('<strong>Decoded:</strong> ').append($decoded);
-  };
+    return $('<div class="decoded">').html('<strong>Decoded:</strong> ').append($decoded)
+  }
 
   var getOutput = function () {
-    var $result = $('<div class="result" />');
-    var $close = $('<div class="udapp-close" />');
-    $close.click(function () { $result.remove(); });
-    $result.append($close);
-    return $result;
-  };
+    var $result = $('<div class="result" />')
+    var $close = $('<div class="udapp-close" />')
+    $close.click(function () { $result.remove() })
+    $result.append($close)
+    return $result
+  }
   var clearOutput = function ($result) {
-    $(':not(.udapp-close)', $result).remove();
-  };
+    $(':not(.udapp-close)', $result).remove()
+  }
   var replaceOutput = function ($result, message) {
-    clearOutput($result);
-    $result.append(message);
-  };
+    clearOutput($result)
+    $result.append(message)
+  }
 
   var handleCallButtonClick = function (ev, $result) {
     if (!$result) {
-      $result = getOutput();
+      $result = getOutput()
       if (lookupOnly && !inputs.length) {
-        $outputOverride.empty().append($result);
+        $outputOverride.empty().append($result)
       } else {
-        outputSpan.append($result);
+        outputSpan.append($result)
       }
     }
 
-    var funArgs = '';
+    var funArgs = ''
     try {
-      funArgs = $.parseJSON('[' + inputField.val() + ']');
+      funArgs = $.parseJSON('[' + inputField.val() + ']')
     } catch (e) {
-      replaceOutput($result, $('<span/>').text('Error encoding arguments: ' + e));
-      return;
+      replaceOutput($result, $('<span/>').text('Error encoding arguments: ' + e))
+      return
     }
-    var data = '';
+    var data = ''
     if (!isConstructor || funArgs.length > 0) {
       try {
-        data = args.encode(funArgs);
+        data = args.encode(funArgs)
       } catch (e) {
-        replaceOutput($result, $('<span/>').text('Error encoding arguments: ' + e));
-        return;
+        replaceOutput($result, $('<span/>').text('Error encoding arguments: ' + e))
+        return
       }
     }
     if (data.slice(0, 9) === 'undefined') {
-      data = data.slice(9);
+      data = data.slice(9)
     }
     if (data.slice(0, 2) === '0x') {
-      data = data.slice(2);
+      data = data.slice(2)
     }
 
-    replaceOutput($result, $('<span>Waiting for transaction to be mined...</span>'));
+    replaceOutput($result, $('<span>Waiting for transaction to be mined...</span>'))
 
     if (isConstructor) {
       if (args.bytecode.indexOf('_') >= 0) {
-        replaceOutput($result, $('<span>Deploying and linking required libraries...</span>'));
+        replaceOutput($result, $('<span>Deploying and linking required libraries...</span>'))
         self.linkBytecode(args.contractName, function (err, bytecode) {
           if (err) {
-            replaceOutput($result, $('<span/>').text('Error deploying required libraries: ' + err));
+            replaceOutput($result, $('<span/>').text('Error deploying required libraries: ' + err))
           } else {
-            args.bytecode = bytecode;
-            handleCallButtonClick(ev, $result);
+            args.bytecode = bytecode
+            handleCallButtonClick(ev, $result)
           }
-        });
-        return;
+        })
+        return
       } else {
-        data = args.bytecode + data;
+        data = args.bytecode + data
       }
     }
 
@@ -510,235 +510,235 @@ UniversalDApp.prototype.getCallButton = function (args) {
       // Only decode if there supposed to be fields
       if (args.abi.outputs.length > 0) {
         try {
-          var i;
+          var i
 
-          var outputTypes = [];
+          var outputTypes = []
           for (i = 0; i < args.abi.outputs.length; i++) {
-            outputTypes.push(args.abi.outputs[i].type);
+            outputTypes.push(args.abi.outputs[i].type)
           }
 
           // decode data
-          var decodedObj = ethJSABI.rawDecode(outputTypes, response);
+          var decodedObj = ethJSABI.rawDecode(outputTypes, response)
 
           // format decoded data
-          decodedObj = ethJSABI.stringify(outputTypes, decodedObj);
+          decodedObj = ethJSABI.stringify(outputTypes, decodedObj)
           for (i = 0; i < outputTypes.length; i++) {
-            var name = args.abi.outputs[i].name;
+            var name = args.abi.outputs[i].name
             if (name.length > 0) {
-              decodedObj[i] = outputTypes[i] + ' ' + name + ': ' + decodedObj[i];
+              decodedObj[i] = outputTypes[i] + ' ' + name + ': ' + decodedObj[i]
             } else {
-              decodedObj[i] = outputTypes[i] + ': ' + decodedObj[i];
+              decodedObj[i] = outputTypes[i] + ': ' + decodedObj[i]
             }
           }
 
-          return getDecodedOutput(decodedObj);
+          return getDecodedOutput(decodedObj)
         } catch (e) {
-          return getDecodedOutput('Failed to decode output: ' + e);
+          return getDecodedOutput('Failed to decode output: ' + e)
         }
       }
-    };
+    }
 
-    var decoded;
+    var decoded
     self.runTx({ to: args.address, data: data, useCall: args.abi.constant && !isConstructor }, function (err, result) {
       if (err) {
-        replaceOutput($result, $('<span/>').text(err).addClass('error'));
+        replaceOutput($result, $('<span/>').text(err).addClass('error'))
       // VM only
       } else if (self.executionContext.isVM() && result.vm.exception === 0 && result.vm.exceptionError) {
-        replaceOutput($result, $('<span/>').text('VM Exception: ' + result.vm.exceptionError).addClass('error'));
-        $result.append(getDebugTransaction(result));
+        replaceOutput($result, $('<span/>').text('VM Exception: ' + result.vm.exceptionError).addClass('error'))
+        $result.append(getDebugTransaction(result))
       // VM only
       } else if (self.executionContext.isVM() && result.vm.return === undefined) {
-        replaceOutput($result, $('<span/>').text('Exception during execution.').addClass('error'));
-        $result.append(getDebugTransaction(result));
+        replaceOutput($result, $('<span/>').text('Exception during execution.').addClass('error'))
+        $result.append(getDebugTransaction(result))
       } else if (isConstructor) {
-        replaceOutput($result, getGasUsedOutput(result, result.vm));
-        $result.append(getDebugTransaction(result));
-        args.appendFunctions(self.executionContext.isVM() ? result.createdAddress : result.contractAddress);
+        replaceOutput($result, getGasUsedOutput(result, result.vm))
+        $result.append(getDebugTransaction(result))
+        args.appendFunctions(self.executionContext.isVM() ? result.createdAddress : result.contractAddress)
       } else if (self.executionContext.isVM()) {
-        var outputObj = '0x' + result.vm.return.toString('hex');
-        clearOutput($result);
-        $result.append(getReturnOutput(outputObj)).append(getGasUsedOutput(result, result.vm));
+        var outputObj = '0x' + result.vm.return.toString('hex')
+        clearOutput($result)
+        $result.append(getReturnOutput(outputObj)).append(getGasUsedOutput(result, result.vm))
 
-        decoded = decodeResponse(result.vm.return);
+        decoded = decodeResponse(result.vm.return)
         if (decoded) {
-          $result.append(decoded);
+          $result.append(decoded)
         }
         if (args.abi.constant) {
-          $result.append(getDebugCall(result));
+          $result.append(getDebugCall(result))
         } else {
-          $result.append(getDebugTransaction(result));
+          $result.append(getDebugTransaction(result))
         }
       } else if (args.abi.constant && !isConstructor) {
-        clearOutput($result);
-        $result.append(getReturnOutput(result)).append(getGasUsedOutput({}));
+        clearOutput($result)
+        $result.append(getReturnOutput(result)).append(getGasUsedOutput({}))
 
-        decoded = decodeResponse(ethJSUtil.toBuffer(result));
+        decoded = decodeResponse(ethJSUtil.toBuffer(result))
         if (decoded) {
-          $result.append(decoded);
+          $result.append(decoded)
         }
       } else {
-        clearOutput($result);
-        $result.append(getReturnOutput(result)).append(getGasUsedOutput(result));
-        $result.append(getDebugTransaction(result));
+        clearOutput($result)
+        $result.append(getReturnOutput(result)).append(getGasUsedOutput(result))
+        $result.append(getDebugTransaction(result))
       }
-    });
-  };
+    })
+  }
 
   var button = $('<button />')
     .addClass('call')
     .attr('title', args.abi.name)
     .text(args.bytecode ? 'Create' : args.abi.name)
-    .click(handleCallButtonClick);
+    .click(handleCallButtonClick)
 
   if (lookupOnly && !inputs.length) {
-    handleCallButtonClick();
+    handleCallButtonClick()
   }
 
-  var $contractProperty = $('<div class="contractProperty"/>');
+  var $contractProperty = $('<div class="contractProperty"/>')
   $contractProperty
     .toggleClass('constant', !isConstructor && args.abi.constant)
     .toggleClass('hasArgs', args.abi.inputs.length > 0)
     .toggleClass('constructor', isConstructor)
     .append(button)
-    .append((lookupOnly && !inputs.length) ? $outputOverride : inputField);
-  return $contractProperty.append(outputSpan);
-};
+    .append((lookupOnly && !inputs.length) ? $outputOverride : inputField)
+  return $contractProperty.append(outputSpan)
+}
 
 UniversalDApp.prototype.linkBytecode = function (contractName, cb) {
-  var self = this;
-  var bytecode = self.getContractByName(contractName).bytecode;
+  var self = this
+  var bytecode = self.getContractByName(contractName).bytecode
   if (bytecode.indexOf('_') < 0) {
-    return cb(null, bytecode);
+    return cb(null, bytecode)
   }
-  var m = bytecode.match(/__([^_]{1,36})__/);
+  var m = bytecode.match(/__([^_]{1,36})__/)
   if (!m) {
-    return cb('Invalid bytecode format.');
+    return cb('Invalid bytecode format.')
   }
-  var libraryName = m[1];
+  var libraryName = m[1]
   if (!self.getContractByName(libraryName)) {
-    return cb('Library ' + libraryName + ' not found.');
+    return cb('Library ' + libraryName + ' not found.')
   }
   self.deployLibrary(libraryName, function (err, address) {
     if (err) {
-      return cb(err);
+      return cb(err)
     }
-    var libLabel = '__' + libraryName + Array(39 - libraryName.length).join('_');
-    var hexAddress = address.toString('hex');
+    var libLabel = '__' + libraryName + Array(39 - libraryName.length).join('_')
+    var hexAddress = address.toString('hex')
     if (hexAddress.slice(0, 2) === '0x') {
-      hexAddress = hexAddress.slice(2);
+      hexAddress = hexAddress.slice(2)
     }
-    hexAddress = Array(40 - hexAddress.length + 1).join('0') + hexAddress;
+    hexAddress = Array(40 - hexAddress.length + 1).join('0') + hexAddress
     while (bytecode.indexOf(libLabel) >= 0) {
-      bytecode = bytecode.replace(libLabel, hexAddress);
+      bytecode = bytecode.replace(libLabel, hexAddress)
     }
-    self.getContractByName(contractName).bytecode = bytecode;
-    self.linkBytecode(contractName, cb);
-  });
-};
+    self.getContractByName(contractName).bytecode = bytecode
+    self.linkBytecode(contractName, cb)
+  })
+}
 
 UniversalDApp.prototype.deployLibrary = function (contractName, cb) {
-  var self = this;
+  var self = this
   if (self.getContractByName(contractName).address) {
-    return cb(null, self.getContractByName(contractName).address);
+    return cb(null, self.getContractByName(contractName).address)
   }
-  var bytecode = self.getContractByName(contractName).bytecode;
+  var bytecode = self.getContractByName(contractName).bytecode
   if (bytecode.indexOf('_') >= 0) {
     self.linkBytecode(contractName, function (err, bytecode) {
-      if (err) cb(err);
-      else self.deployLibrary(contractName, cb);
-    });
+      if (err) cb(err)
+      else self.deployLibrary(contractName, cb)
+    })
   } else {
     self.runTx({ data: bytecode, useCall: false }, function (err, result) {
       if (err) {
-        return cb(err);
+        return cb(err)
       }
-      var address = self.executionContext.isVM() ? result.createdAddress : result.contractAddress;
-      self.getContractByName(contractName).address = address;
-      cb(err, address);
-    });
+      var address = self.executionContext.isVM() ? result.createdAddress : result.contractAddress
+      self.getContractByName(contractName).address = address
+      cb(err, address)
+    })
   }
-};
+}
 
 UniversalDApp.prototype.clickContractAt = function (self, $output, contract) {
-  var address = prompt('What Address is this contract at in the Blockchain? ie: 0xdeadbeaf...');
-  self.getInstanceInterface(contract, address, $output);
-};
+  var address = prompt('What Address is this contract at in the Blockchain? ie: 0xdeadbeaf...')
+  self.getInstanceInterface(contract, address, $output)
+}
 
 function tryTillResponse (web3, txhash, done) {
   web3.eth.getTransactionReceipt(txhash, function (err, address) {
     if (!err && !address) {
       // Try again with a bit of delay
-      setTimeout(function () { tryTillResponse(web3, txhash, done); }, 500);
+      setTimeout(function () { tryTillResponse(web3, txhash, done) }, 500)
     } else {
-      done(err, address);
+      done(err, address)
     }
-  });
+  })
 }
 
 UniversalDApp.prototype.runTx = function (args, cb) {
-  var self = this;
-  var to = args.to;
-  var data = args.data;
+  var self = this
+  var to = args.to
+  var data = args.data
   if (data.slice(0, 2) !== '0x') {
-    data = '0x' + data;
+    data = '0x' + data
   }
 
-  var gasLimit = 3000000;
+  var gasLimit = 3000000
   if (self.getGasLimit) {
     try {
-      gasLimit = self.getGasLimit();
+      gasLimit = self.getGasLimit()
     } catch (e) {
-      return cb(e);
+      return cb(e)
     }
   }
 
-  var value = 0;
+  var value = 0
   if (self.getValue) {
     try {
-      value = self.getValue();
+      value = self.getValue()
     } catch (e) {
-      return cb(e);
+      return cb(e)
     }
   }
 
-  var tx;
+  var tx
   if (!self.executionContext.isVM()) {
     tx = {
       from: self.getAddress ? self.getAddress() : self.web3.eth.accounts[0],
       to: to,
       data: data,
       value: value
-    };
+    }
     if (args.useCall) {
-      tx.gas = gasLimit;
-      self.web3.eth.call(tx, cb);
+      tx.gas = gasLimit
+      self.web3.eth.call(tx, cb)
     } else {
       self.web3.eth.estimateGas(tx, function (err, resp) {
         if (err) {
-          return cb(err, resp);
+          return cb(err, resp)
         }
 
         if (resp > gasLimit) {
-          return cb('Gas required exceeds limit: ' + resp);
+          return cb('Gas required exceeds limit: ' + resp)
         }
 
-        tx.gas = resp;
+        tx.gas = resp
 
-        var sendTransaction = self.personalMode ? self.web3.personal.unlockAccountAndSendTransaction : self.web3.eth.sendTransaction;
+        var sendTransaction = self.personalMode ? self.web3.personal.unlockAccountAndSendTransaction : self.web3.eth.sendTransaction
 
         sendTransaction(tx, function (err, resp) {
           if (err) {
-            return cb(err, resp);
+            return cb(err, resp)
           }
 
-          tryTillResponse(self.web3, resp, cb);
-        });
-      });
+          tryTillResponse(self.web3, resp, cb)
+        })
+      })
     }
   } else {
     try {
-      var address = self.getAddress ? self.getAddress() : Object.keys(self.accounts)[0];
-      var account = self.accounts[address];
+      var address = self.getAddress ? self.getAddress() : Object.keys(self.accounts)[0]
+      var account = self.accounts[address]
       tx = new EthJSTX({
         nonce: new BN(account.nonce++),
         gasPrice: new BN(1),
@@ -746,8 +746,8 @@ UniversalDApp.prototype.runTx = function (args, cb) {
         to: to,
         value: new BN(value, 10),
         data: new Buffer(data.slice(2), 'hex')
-      });
-      tx.sign(account.privateKey);
+      })
+      tx.sign(account.privateKey)
       var block = new EthJSBlock({
         header: {
           // FIXME: support coinbase, difficulty and gasLimit
@@ -756,18 +756,18 @@ UniversalDApp.prototype.runTx = function (args, cb) {
         },
         transactions: [],
         uncleHeaders: []
-      });
+      })
       if (!args.useCall) {
-        ++self.blockNumber;
+        ++self.blockNumber
       }
       self.vm.runTx({block: block, tx: tx, skipBalance: true, skipNonce: true}, function (err, result) {
-        result.transactionHash = self.txdebugger.web3().releaseCurrentHash(); // used to keep track of the transaction
-        cb(err, result);
-      });
+        result.transactionHash = self.txdebugger.web3().releaseCurrentHash() // used to keep track of the transaction
+        cb(err, result)
+      })
     } catch (e) {
-      cb(e, null);
+      cb(e, null)
     }
   }
-};
+}
 
-module.exports = UniversalDApp;
+module.exports = UniversalDApp
diff --git a/test-browser/helpers/contracts.js b/test-browser/helpers/contracts.js
index 3046ccc037..0f19b29af2 100644
--- a/test-browser/helpers/contracts.js
+++ b/test-browser/helpers/contracts.js
@@ -1,23 +1,23 @@
 module.exports = {
   checkCompiledContracts: function (browser, compiled, callback) {
     browser.execute(function () {
-      var contracts = document.querySelectorAll('.udapp .contract');
-      var ret = [];
+      var contracts = document.querySelectorAll('.udapp .contract')
+      var ret = []
       for (var k in contracts) {
-        var el = contracts[k];
+        var el = contracts[k]
         if (el.querySelector) {
           ret.push({
             name: el.querySelector('.title').innerText.replace(el.querySelector('.size').innerText, '').replace(/(\t)|(\r)|(\n)/g, '') // IE/firefox add \r\n
-          });
+          })
         }
       }
-      return ret;
+      return ret
     }, [''], function (result) {
-      browser.assert.equal(result.value.length, compiled.length);
+      browser.assert.equal(result.value.length, compiled.length)
       result.value.map(function (item, i) {
-        browser.assert.equal(item.name, compiled[i]);
-      });
-      callback();
-    });
+        browser.assert.equal(item.name, compiled[i])
+      })
+      callback()
+    })
   }
-};
+}
diff --git a/test-browser/mockcompiler/compiler.js b/test-browser/mockcompiler/compiler.js
index 0c032a0763..664a06f88c 100644
--- a/test-browser/mockcompiler/compiler.js
+++ b/test-browser/mockcompiler/compiler.js
@@ -1,5 +1,5 @@
 var Module = { // eslint-disable-line
-  cwrap: function () { return arguments[0] === 'version' ? version : compile; },
+  cwrap: function () { return arguments[0] === 'version' ? version : compile },
   writeStringToMemory: function () {},
   setValue: function () {},
   Pointer_stringify: function () {},
@@ -10,32 +10,32 @@ var Module = { // eslint-disable-line
   _compileJSONMulti: {},
   _compileJSONCallback: {},
   _compileJSON: {}
-};
+}
 
 function compile (source, optimization, missingInputs) {
   if (typeof source === 'string') {
-    source = JSON.parse(source);
+    source = JSON.parse(source)
   }
-  var key = optimization.toString();
+  var key = optimization.toString()
   for (var k in source.sources) {
-    key += k + source.sources[k];
+    key += k + source.sources[k]
   }
-  key = key.replace(/(\t)|(\n)|( )/g, '');
-  var data = mockData[key]; // eslint-disable-line
+  key = key.replace(/(\t)|(\n)|( )/g, '')
+  var data = mockData[key] // eslint-disable-line
   if (data === undefined) {
     return JSON.stringify({
       errors: ['mock compiler: source not found']
-    });
+    })
   } else {
     data.missingInputs.map(function (item, i) {
       if (missingInputs) {
-        missingInputs(item);
+        missingInputs(item)
       }
-    });
+    })
   }
-  return JSON.stringify(data.result);
+  return JSON.stringify(data.result)
 }
 
 function version () {
-  return 'mock compiler';
+  return 'mock compiler'
 }
diff --git a/test-browser/mockcompiler/requests.js b/test-browser/mockcompiler/requests.js
index af6cd883e7..4c0a72558c 100644
--- a/test-browser/mockcompiler/requests.js
+++ b/test-browser/mockcompiler/requests.js
@@ -6,72 +6,72 @@ module.exports = {
   },
   'ballot': {
     'sources': {
-      'Untitled': `pragma solidity ^0.4.0;
+      'Untitled': `pragma solidity ^0.4.0
 contract Ballot {
 
     struct Voter {
-        uint weight;
-        bool voted;
-        uint8 vote;
-        address delegate;
+        uint weight
+        bool voted
+        uint8 vote
+        address delegate
     }
     struct Proposal {
-        uint voteCount;
+        uint voteCount
     }
 
-    address chairperson;
-    mapping(address => Voter) voters;
-    Proposal[] proposals;
+    address chairperson
+    mapping(address => Voter) voters
+    Proposal[] proposals
 
     /// Create a new ballot with $(_numProposals) different proposals.
     function Ballot(uint8 _numProposals) {
-        chairperson = msg.sender;
-        voters[chairperson].weight = 1;
-        proposals.length = _numProposals;
+        chairperson = msg.sender
+        voters[chairperson].weight = 1
+        proposals.length = _numProposals
     }
 
     /// Give $(voter) the right to vote on this ballot.
     /// May only be called by $(chairperson).
     function giveRightToVote(address voter) {
-        if (msg.sender != chairperson || voters[voter].voted) return;
-        voters[voter].weight = 1;
+        if (msg.sender != chairperson || voters[voter].voted) return
+        voters[voter].weight = 1
     }
 
     /// Delegate your vote to the voter $(to).
     function delegate(address to) {
-        Voter sender = voters[msg.sender]; // assigns reference
-        if (sender.voted) return;
+        Voter sender = voters[msg.sender] // assigns reference
+        if (sender.voted) return
         while (voters[to].delegate != address(0) && voters[to].delegate != msg.sender)
-            to = voters[to].delegate;
-        if (to == msg.sender) return;
-        sender.voted = true;
-        sender.delegate = to;
-        Voter delegate = voters[to];
+            to = voters[to].delegate
+        if (to == msg.sender) return
+        sender.voted = true
+        sender.delegate = to
+        Voter delegate = voters[to]
         if (delegate.voted)
-            proposals[delegate.vote].voteCount += sender.weight;
+            proposals[delegate.vote].voteCount += sender.weight
         else
-            delegate.weight += sender.weight;
+            delegate.weight += sender.weight
     }
 
     /// Give a single vote to proposal $(proposal).
     function vote(uint8 proposal) {
-        Voter sender = voters[msg.sender];
-        if (sender.voted || proposal >= proposals.length) return;
-        sender.voted = true;
-        sender.vote = proposal;
-        proposals[proposal].voteCount += sender.weight;
+        Voter sender = voters[msg.sender]
+        if (sender.voted || proposal >= proposals.length) return
+        sender.voted = true
+        sender.vote = proposal
+        proposals[proposal].voteCount += sender.weight
     }
 
     function winningProposal() constant returns (uint8 winningProposal) {
-        uint256 winningVoteCount = 0;
+        uint256 winningVoteCount = 0
         for (uint8 proposal = 0; proposal < proposals.length; proposal++)
             if (proposals[proposal].voteCount > winningVoteCount) {
-                winningVoteCount = proposals[proposal].voteCount;
-                winningProposal = proposal;
+                winningVoteCount = proposals[proposal].voteCount
+                winningProposal = proposal
             }
     }
 }
 `
     }
   }
-};
+}
diff --git a/test-browser/tests/ballot.js b/test-browser/tests/ballot.js
index 564798a4ed..b96f71a4ad 100644
--- a/test-browser/tests/ballot.js
+++ b/test-browser/tests/ballot.js
@@ -1,22 +1,24 @@
-'use strict';
-var testData = require('../mockcompiler/requests');
-// var contractHelper = require('../helpers/contracts');
+'use strict'
+var testData = require('../mockcompiler/requests')
+// var contractHelper = require('../helpers/contracts')
 
 module.exports = {
   'Ballot': function (browser) {
-    runTests(browser, testData);
+    runTests(browser, testData)
   }
-};
+}
 
 function runTests (browser, testData) {
   browser
     .url('http://127.0.0.1:8080/#version=builtin')
-    .waitForElementVisible('.newFile', 10000);
-  browser.assert.notEqual(testData, null);
-  // TODO add Ballot tests. -> setValue('#input textarea', ... ) is not working properly with that contract.
-  /* testBallot(browser, testData.ballot.sources.Untitled, function () {
-    browser.end();
-  });*/
+    .waitForElementVisible('.newFile', 10000)
+  browser.assert.notEqual(testData, null)
+// TODO add Ballot tests. -> setValue('#input textarea', ... ) is not working properly with that contract.
+/*
+  testBallot(browser, testData.ballot.sources.Untitled, function () {
+    browser.end()
+  });
+*/
 }
 
 /*
@@ -25,7 +27,8 @@ function testBallot (browser, contract, callback) {
     .click('.newFile')
     .clearValue('#input textarea')
     .setValue('#input textarea', contract, function () {
-      browser.pause('10000');
-      contractHelper.checkCompiledContracts(browser, ['Ballot'], callback);
-    });
-}*/
+      browser.pause('10000')
+      contractHelper.checkCompiledContracts(browser, ['Ballot'], callback)
+    })
+}
+*/
diff --git a/test-browser/tests/debugger.js b/test-browser/tests/debugger.js
index d0f8baa3f5..80daaaf3b6 100644
--- a/test-browser/tests/debugger.js
+++ b/test-browser/tests/debugger.js
@@ -1,4 +1,4 @@
-'use strict';
+'use strict'
 
 module.exports = {
   'Debugger Render': function (browser) {
@@ -6,6 +6,6 @@ module.exports = {
       .url('http://127.0.0.1:8080/#version=builtin')
       .waitForElementPresent('#debugger', 10000)
       .waitForElementPresent('#debugger #slider', 10000)
-      .end();
+      .end()
   }
-};
+}
diff --git a/test-browser/tests/new-file-test.js b/test-browser/tests/new-file-test.js
index 410c9b71c4..5438adfaa3 100644
--- a/test-browser/tests/new-file-test.js
+++ b/test-browser/tests/new-file-test.js
@@ -1,4 +1,4 @@
-'use strict';
+'use strict'
 
 module.exports = {
   'New file test': function (browser) {
@@ -8,6 +8,6 @@ module.exports = {
       .click('.newFile')
       .pause('10000')
       .assert.containsText('.active', 'Untitled')
-      .end();
+      .end()
   }
-};
+}
diff --git a/test-browser/tests/simpleContract.js b/test-browser/tests/simpleContract.js
index bf61abdb24..6998c264a4 100644
--- a/test-browser/tests/simpleContract.js
+++ b/test-browser/tests/simpleContract.js
@@ -1,21 +1,21 @@
-'use strict';
-var testData = require('../mockcompiler/requests');
-var contractHelper = require('../helpers/contracts');
+'use strict'
+var testData = require('../mockcompiler/requests')
+var contractHelper = require('../helpers/contracts')
 
 module.exports = {
   'Simple Contract': function (browser) {
-    runTests(browser, testData);
+    runTests(browser, testData)
   }
-};
+}
 
 function runTests (browser, testData) {
   browser
     .url('http://127.0.0.1:8080/#version=builtin')
-    .waitForElementVisible('.newFile', 10000);
-  browser.assert.notEqual(testData, null);
+    .waitForElementVisible('.newFile', 10000)
+  browser.assert.notEqual(testData, null)
   testSimpleContract(browser, testData.testSimpleContract.sources.Untitled, function () {
-    browser.end();
-  });
+    browser.end()
+  })
 }
 
 function testSimpleContract (browser, contract, callback) {
@@ -23,6 +23,6 @@ function testSimpleContract (browser, contract, callback) {
     .click('.newFile')
     .clearValue('#input textarea')
     .setValue('#input textarea', contract)
-    .pause('5000');
-  contractHelper.checkCompiledContracts(browser, ['test1', 'test2'], callback);
+    .pause('5000')
+  contractHelper.checkCompiledContracts(browser, ['test1', 'test2'], callback)
 }
diff --git a/test-browser/tests/smoke-test.js b/test-browser/tests/smoke-test.js
index 0a71df1fc1..d56f8d0cd6 100644
--- a/test-browser/tests/smoke-test.js
+++ b/test-browser/tests/smoke-test.js
@@ -1,4 +1,4 @@
-'use strict';
+'use strict'
 
 module.exports = {
   'Smoke test': function (browser) {
@@ -7,6 +7,6 @@ module.exports = {
       .waitForElementVisible('#righthand-panel', 10000)
       .pause('10000')
       .assert.containsText('#righthand-panel', 'Solidity version')
-      .end();
+      .end()
   }
-};
+}
diff --git a/test/compiler-test.js b/test/compiler-test.js
index 224bf2f701..5b7f315892 100644
--- a/test/compiler-test.js
+++ b/test/compiler-test.js
@@ -1,19 +1,19 @@
-'use strict';
+'use strict'
 
-var test = require('tape');
+var test = require('tape')
 
-var Compiler = require('../src/app/compiler');
-var EventManager = require('../src/lib/eventManager');
+var Compiler = require('../src/app/compiler')
+var EventManager = require('../src/lib/eventManager')
 
 test('compiler.compile smoke', function (t) {
-  t.plan(1);
+  t.plan(1)
 
-  var noop = function () {};
-  var getCacheFile = function () { return 'fakeCacheFile'; };
-  var fakeEditor = {onChangeSetup: noop, clearAnnotations: noop, getValue: noop, setCacheFileContent: noop, getCacheFile: getCacheFile};
-  var fakeQueryParams = {get: function () { return {}; }};
-  var compiler = new Compiler(fakeEditor, fakeQueryParams, null, null, new EventManager());
-  compiler.setCompileJSON(noop);
-  compiler.compile();
-  t.ok(compiler);
-});
+  var noop = function () {}
+  var getCacheFile = function () { return 'fakeCacheFile' }
+  var fakeEditor = {onChangeSetup: noop, clearAnnotations: noop, getValue: noop, setCacheFileContent: noop, getCacheFile: getCacheFile}
+  var fakeQueryParams = {get: function () { return {} }}
+  var compiler = new Compiler(fakeEditor, fakeQueryParams, null, null, new EventManager())
+  compiler.setCompileJSON(noop)
+  compiler.compile()
+  t.ok(compiler)
+})
diff --git a/test/gist-handler-test.js b/test/gist-handler-test.js
index bd728754cd..76584e73ca 100644
--- a/test/gist-handler-test.js
+++ b/test/gist-handler-test.js
@@ -1,71 +1,70 @@
-'use strict';
+'use strict'
 
-var test = require('tape');
+var test = require('tape')
 
-var GistHandler = require('../src/app/gist-handler');
+var GistHandler = require('../src/app/gist-handler')
 
 test('gistHandler.handleLoad with no gist param', function (t) {
-  t.plan(1);
+  t.plan(1)
 
-  var gistHandler = new GistHandler({});
+  var gistHandler = new GistHandler({})
 
-  var params = {};
-  var result = gistHandler.handleLoad(params, null);
+  var params = {}
+  var result = gistHandler.handleLoad(params, null)
 
-  t.equal(result, false);
-});
+  t.equal(result, false)
+})
 
 test('gistHandler.handleLoad with blank gist param, and invalid user input', function (t) {
-  t.plan(3);
+  t.plan(3)
 
   var fakeWindow = {prompt: function (message) {
-    t.ok(message);
-    t.ok(message.match(/gist/i));
-    return 'invalid';
-  }};
+    t.ok(message)
+    t.ok(message.match(/gist/i))
+    return 'invalid'
+  }}
 
-  var gistHandler = new GistHandler(fakeWindow);
+  var gistHandler = new GistHandler(fakeWindow)
 
-  var params = {'gist': ''};
-  var result = gistHandler.handleLoad(params, null);
+  var params = {'gist': ''}
+  var result = gistHandler.handleLoad(params, null)
 
-  t.equal(result, false);
-});
+  t.equal(result, false)
+})
 
 test('gistHandler.handleLoad with blank gist param, and valid user input', function (t) {
-  t.plan(4);
+  t.plan(4)
 
   var fakeWindow = {prompt: function (message) {
-    t.ok(message);
-    t.ok(message.match(/gist/i));
-    return 'Beef1234';
-  }};
+    t.ok(message)
+    t.ok(message.match(/gist/i))
+    return 'Beef1234'
+  }}
 
   var cb = function (gistId) {
-    t.equal(gistId, 'Beef1234');
-  };
+    t.equal(gistId, 'Beef1234')
+  }
 
-  var gistHandler = new GistHandler(fakeWindow);
+  var gistHandler = new GistHandler(fakeWindow)
 
-  var params = {'gist': ''};
-  var result = gistHandler.handleLoad(params, cb);
+  var params = {'gist': ''}
+  var result = gistHandler.handleLoad(params, cb)
 
-  t.equal(result, true);
-});
+  t.equal(result, true)
+})
 
 test('gistHandler.handleLoad with gist param', function (t) {
-  t.plan(2);
+  t.plan(2)
 
-  var gistHandler = new GistHandler({});
+  var gistHandler = new GistHandler({})
 
-  var params = {'gist': 'abc'};
+  var params = {'gist': 'abc'}
 
   var cb = function (gistId) {
-    t.equal(gistId, 'abc');
-  };
+    t.equal(gistId, 'abc')
+  }
 
-  var result = gistHandler.handleLoad(params, cb);
-
-  t.equal(result, true);
-});
+  var result = gistHandler.handleLoad(params, cb)
 
+  t.equal(result, true)
+})
diff --git a/test/index.js b/test/index.js
index 0339a49fa1..84d8a5c68f 100644
--- a/test/index.js
+++ b/test/index.js
@@ -1,5 +1,5 @@
-'use strict';
+'use strict'
 
-require('./compiler-test');
-require('./gist-handler-test');
-require('./query-params-test');
+require('./compiler-test')
+require('./gist-handler-test')
+require('./query-params-test')
diff --git a/test/query-params-test.js b/test/query-params-test.js
index a9187ef7eb..4240c99507 100644
--- a/test/query-params-test.js
+++ b/test/query-params-test.js
@@ -1,23 +1,23 @@
-'use strict';
+'use strict'
 
-var test = require('tape');
+var test = require('tape')
 
-var QueryParams = require('../src/app/query-params');
+var QueryParams = require('../src/app/query-params')
 
 test('queryParams.get', function (t) {
-  t.plan(2);
+  t.plan(2)
 
-  var fakeWindow = {location: {hash: '#wat=sup&foo=bar', search: ''}};
-  var params = new QueryParams(fakeWindow).get();
-  t.equal(params.wat, 'sup');
-  t.equal(params.foo, 'bar');
-});
+  var fakeWindow = {location: {hash: '#wat=sup&foo=bar', search: ''}}
+  var params = new QueryParams(fakeWindow).get()
+  t.equal(params.wat, 'sup')
+  t.equal(params.foo, 'bar')
+})
 
 test('queryParams.update', function (t) {
-  t.plan(1);
+  t.plan(1)
 
-  var fakeWindow = {location: {hash: '#wat=sup', search: ''}};
-  var qp = new QueryParams(fakeWindow);
-  qp.update({foo: 'bar'});
-  t.equal(fakeWindow.location.hash, '#wat=sup&foo=bar');
-});
+  var fakeWindow = {location: {hash: '#wat=sup', search: ''}}
+  var qp = new QueryParams(fakeWindow)
+  qp.update({foo: 'bar'})
+  t.equal(fakeWindow.location.hash, '#wat=sup&foo=bar')
+})