diff --git a/app/assets/javascripts/app/index.js.coffee b/app/assets/javascripts/app/index.js.coffee
index 4b61edd96..2e4596b2c 100644
--- a/app/assets/javascripts/app/index.js.coffee
+++ b/app/assets/javascripts/app/index.js.coffee
@@ -23,6 +23,9 @@
 
 #not_used= require_tree ./lib
 #= require_self
+#= require_tree ./models
+#= require_tree ./controllers
+#= require_tree ./views
 #= require ./lib/ajax.js.coffee
 #= require ./lib/clipboard.js.coffee
 #= require ./lib/websocket.js.coffee
@@ -31,9 +34,6 @@
 #= require ./lib/store.js.coffee
 #= require ./lib/collection.js.coffee
 #= require ./lib/event.js.coffee
-#= require_tree ./models
-#= require_tree ./controllers
-#= require_tree ./views
 #= require ./lib/interface_handle.js.coffee
 
 class App extends Spine.Controller
diff --git a/app/assets/javascripts/app/lib/websocket.js.coffee b/app/assets/javascripts/app/lib/websocket.js.coffee
index d3e7d3cb7..052195eec 100644
--- a/app/assets/javascripts/app/lib/websocket.js.coffee
+++ b/app/assets/javascripts/app/lib/websocket.js.coffee
@@ -20,7 +20,7 @@ class App.WebSocket
     _instance.auth(args)
 
 # The actual Singleton class
-class _Singleton extends Spine.Controller
+class _Singleton extends App.Controller
   queue: []
   supported: true
 
@@ -64,12 +64,11 @@ class _Singleton extends Spine.Controller
     @send( { action: 'ping' } )
 
     # check if ping is back within 2 min
-    if @check_id
-      clearTimeout(@check_id)
+    @clearDelay('websocket-ping-check')
     check = =>
       console.log 'no websockend ping response, reconnect...'
       @close()
-    @check_id = @delay check, 120000
+    @delay check, 120000, 'websocket-ping-check'
 
   pong: ->
     return if !@supported
@@ -96,12 +95,10 @@ class _Singleton extends Spine.Controller
 
     # Set event handlers.
     @ws.onopen = =>
-      console.log( "onopen" )
+      console.log( 'onopen' )
 
-      # close error message if exists
-      if @error_delay
-        clearTimeout(@error_delay)
-        @error_delay = undefined
+      # close error message show up (because try so connect again) if exists
+      @clearDelay('websocket-no-connection-try-reconnect')
       if @error
         @error.modalHide()
         @error = undefined
@@ -156,7 +153,7 @@ class _Singleton extends Spine.Controller
           @error = new App.ErrorModal(
             message: 'No connection to websocket, trying to reconnect...'
           )
-        @error_delay = @delay message, 7000
+        @delay message, 7000, 'websocket-no-connection-try-reconnect'
 
       # try reconnect after 4.5 sec.
       @delay @connect, 4500