diff --git a/src/app.js b/src/app.js
index 36fd4ff0cb..cefc861f79 100644
--- a/src/app.js
+++ b/src/app.js
@@ -436,7 +436,7 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
       registry.get('compilersartefacts').api
     ),
     settings: new SettingsTab(self._components.registry),
-    analysis: new AnalysisTab(self._components.registry),
+    analysis: new AnalysisTab(registry),
     debug: new DebuggerTab(self._components.registry),
     support: new SupportTab(self._components.registry),
     test: new TestTab(self._components.registry, compileTab)
diff --git a/src/app/tabs/analysis-tab.js b/src/app/tabs/analysis-tab.js
index f2d3b8d6bd..a47a44a7aa 100644
--- a/src/app/tabs/analysis-tab.js
+++ b/src/app/tabs/analysis-tab.js
@@ -2,35 +2,31 @@ var yo = require('yo-yo')
 var csjs = require('csjs-inject')
 var StaticAnalysis = require('../staticanalysis/staticAnalysisView')
 
-var globalRegistry = require('../../global/registry')
 var EventManager = require('../../lib/events')
 
-module.exports = class AnalysisTab {
-  constructor (localRegistry) {
-    const self = this
-    self.event = new EventManager()
-    self._view = { el: null }
-    self.data = {}
-    self._components = {}
-    self._components.registry = localRegistry || globalRegistry
-    self._deps = {}
+class AnalysisTab {
+
+  constructor (registry) {
+    this.event = new EventManager()
+    this.registry = registry
   }
+
   render () {
-    const self = this
     var staticanalysis = new StaticAnalysis()
+
     staticanalysis.event.register('staticAnaysisWarning', (count) => {
-      if (count > 0) {
-        const msg = `Static Analysis raised ${count} warning(s) that requires your attention. Check Solidity Static Analysis Module for more information.`
-        const settings = { type: 'staticAnalysisWarning', useSpan: true }
-        self.event.trigger('newStaticAnaysisWarningMessage', [msg, settings])
-      }
+      if (count <= 0) return
+      const msg = `Static Analysis raised ${count} warning(s) that requires your attention. Check Solidity Static Analysis Module for more information.`
+      const settings = { type: 'staticAnalysisWarning', useSpan: true }
+      this.event.trigger('newStaticAnaysisWarningMessage', [msg, settings])
     })
-    self._components.registry.put({api: staticanalysis, name: 'staticanalysis'})
-    if (self._view.el) return self._view.el
-    self._view.el = yo`
+
+    this.registry.put({api: staticanalysis, name: 'staticanalysis'})
+    if (this.el) return this.el
+    this.el = yo`
       <div class="${css.analysisTabView} "id="staticanalysisView">${staticanalysis.render()}</div>`
 
-    return self._view.el
+    return this.el
   }
 }
 const css = csjs`
@@ -41,3 +37,5 @@ const css = csjs`
     flex-direction: column;
   }
 `
+
+module.exports = AnalysisTab