diff --git a/game/client_types/autoplay.js b/game/client_types/autoplay.js
index 6099286..16ea25b 100644
--- a/game/client_types/autoplay.js
+++ b/game/client_types/autoplay.js
@@ -10,11 +10,11 @@
 
 module.exports = function(treatmentName, settings, stager, setup, gameRoom) {
 
-    var ngc =  require('nodegame-client');
-    
-    var game, stager;
-    
-    game = gameRoom.getClientType('player');
+    const ngc =  require('nodegame-client');
+
+    var stager;
+
+    let game = gameRoom.getClientType('player');
     game.nodename = 'autoplay';
 
     game.env.allowTimeup = true;
@@ -42,7 +42,7 @@ module.exports = function(treatmentName, settings, stager, setup, gameRoom) {
             }
         }
     });
-    
+
 
     // Gameover will be executed only in 'auto' mode.
     stager.setOnGameOver(function() {
@@ -51,10 +51,6 @@ module.exports = function(treatmentName, settings, stager, setup, gameRoom) {
             window.close();
         }, 60000);
     });
-    
+
     return game;
 };
-
-
-
-
diff --git a/game/client_types/player.js b/game/client_types/player.js
index 5f5b6ca..d76b99a 100644
--- a/game/client_types/player.js
+++ b/game/client_types/player.js
@@ -10,8 +10,8 @@
  * http://www.nodegame.org
  * ---
  */
-var ngc = require('nodegame-client');
-var stepRules = ngc.stepRules;
+const ngc = require('nodegame-client');
+const stepRules = ngc.stepRules;
 
 module.exports = function(treatmentName, settings, stager, setup, gameRoom) {
 
@@ -48,7 +48,7 @@ module.exports = function(treatmentName, settings, stager, setup, gameRoom) {
             }
             node.game.lastDepartureTime = departure;
             node.game.decisionMade(decision);
-            setTimeout(function() {
+            node.timer.setTimeout(function() {
                 W.getElementById('decision').click();
             }, 2000);
         };
@@ -292,7 +292,5 @@ module.exports = function(treatmentName, settings, stager, setup, gameRoom) {
             console.log('PHANTOMJS EXITING');
         }
     });
-    
-};
-
 
+};