diff --git a/src/util/astWalker.js b/src/util/astWalker.js
index 7e38011d94..e5aca31fe2 100644
--- a/src/util/astWalker.js
+++ b/src/util/astWalker.js
@@ -9,18 +9,16 @@ function AstWalker () {
     *
     * @param {Object} ast  - AST node
     * @param {Object or Function} callback  - if (Function) the function will be called for every node.
-    *                                       - if (Object) callback[<Node Type>] will be called for every node of type <Node Type>. callback["*"] will be called fo all other nodes.
-    *                                     in each case, if the callback returns false it does not descend into children. If no callback for the current type, children are visited.
+    *                                       - if (Object) callback[<Node Type>] will be called for
+    *                                         every node of type <Node Type>. callback["*"] will be called fo all other nodes.
+    *                                         in each case, if the callback returns false it does not descend into children.
+    *                                         If no callback for the current type, children are visited.
 */
 AstWalker.prototype.walk = function (ast, callback) {
-  crawlNode(ast, callback)
-}
-
-function crawlNode (node, callback) {
-  if (manageCallBack(node, callback) && node.children && node.children.length > 0) {
-    for (var k in node.children) {
-      var child = node.children[k]
-      crawlNode(child, callback)
+  if (manageCallBack(ast, callback) && ast.children && ast.children.length > 0) {
+    for (var k in ast.children) {
+      var child = ast.children[k]
+      this.walk(child, callback)
     }
   }
 }
@@ -29,8 +27,8 @@ function manageCallBack (node, callback) {
   if (callback instanceof Function) {
     return callback(null, node)
   } else if (callback instanceof Object) {
-    if (callback[node.name] instanceof 'Function') {
-      return callback[node.name](null, node)
+    if (callback[node.name] instanceof Function) {
+      return callback[node.name](null, Function)
     } else if (callback['*'] instanceof 'Function') {
       return callback['*'](null, node)
     } else {