diff --git a/lesscpy/lessc/parser.py b/lesscpy/lessc/parser.py
index 44fbeeb..39835e0 100644
--- a/lesscpy/lessc/parser.py
+++ b/lesscpy/lessc/parser.py
@@ -128,7 +128,7 @@ class LessParser(object):
                 if os.path.exists(filename):
                     recurse = LessParser(importlvl=self.importlvl+1)
                     recurse.parse(filename=filename, debuglevel=0)
-                    self.update_scope(recurse.scope)
+                    self.scope.update(recurse.scope)
                 else:
                     err = "Cannot import '%s', file not found" % filename
                     self.handle_error(err, p, 'W')
@@ -147,7 +147,7 @@ class LessParser(object):
         try:
             mixin = Mixin(p)
             mixin.parse(self.scope, self.stash)
-            self.scope[-1]['__mixins__'][mixin.name.strip()] = mixin
+            self.scope.add_mixin(mixin)
         except SyntaxError as e:
             self.handle_error(e, p)
         p[0] = None   
@@ -344,7 +344,7 @@ class LessParser(object):
         """ property_decl           : identifier_list t_popen argument_list t_pclose ';'
         """
         n = p[1][0]
-        mixin = self.scope.mixin(n)
+        mixin = self.scope.mixins(n)
         if mixin:
             if not self.scope.in_mixin():
                 try:
@@ -363,7 +363,7 @@ class LessParser(object):
         """ property_decl           : identifier_list t_popen t_pclose ';'
         """
         n = p[1][0]
-        mixin = self.scope.mixin(n)
+        mixin = self.scope.mixins(n)
         if mixin:
             try:
                 p[0] = mixin.call(None)
@@ -378,7 +378,7 @@ class LessParser(object):
         """
         m = ''.join([u.strip() for u in p[1]])
         l = utility.block_search(m, self.scope)
-        mixin = self.scope.mixin(m)
+        mixin = self.scope.mixins(m)
         if l:
             p[0] = [b.parsed['proplist'] for b in l]
         elif mixin:
@@ -630,14 +630,6 @@ class LessParser(object):
 #    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #  
 
-    def update_scope(self, scope):
-        """
-        """
-        blocks = [b for b in self.scope[0]['__blocks__']]
-        blocks.extend([b for b in scope[0]['__blocks__']])
-        self.scope[0].update(scope[0])
-        self.scope[0]['__blocks__'] = blocks
-
     def p_error(self, t):
         """ Internal error handler
             @param Lex token: Error token 
diff --git a/lesscpy/lessc/scope.py b/lesscpy/lessc/scope.py
index 5b8f316..7b6e3a2 100644
--- a/lesscpy/lessc/scope.py
+++ b/lesscpy/lessc/scope.py
@@ -3,12 +3,12 @@
 class Scope(list):
     def __init__(self):
         super().__init__()
+        self._mixins = {}
         
     def push(self):
         self.append({
             '__variables__' : {},
             '__blocks__': [], 
-            '__mixins__': {}, 
             '__current__': None
         })
         
@@ -19,14 +19,36 @@ class Scope(list):
     @current.setter
     def current(self, value):
         self[-1]['__current__'] = value
+        
+    def add_block(self, block):
+        """
+        """
+        self[-1]['__blocks__'].append(block)
+        
+    def add_mixin(self, mixin):
+        """
+        """
+        self._mixins[mixin.name()] = mixin
     
-    def mixin(self, mixin):
+    def mixins(self, name):
         """
         """
-        return self[0]['__mixins__'][mixin] if mixin in self[0]['__mixins__'] else False
+        return (self._mixins[name] 
+                if name in self._mixins
+                else False)
     
     def in_mixin(self):
         """
         """
         return any([s for s in self 
-                    if s['__current__'] == '__mixin__'])
\ No newline at end of file
+                    if s['__current__'] == '__mixin__'])
+        
+    def update(self, scope):
+        """
+        """
+        blocks = [b for b in self[0]['__blocks__']]
+        blocks.extend([b for b in scope[0]['__blocks__']])
+        self._mixins.update(scope._mixins)
+        self[0].update(scope[0])
+        self[0]['__blocks__'] = blocks
+        
\ No newline at end of file
diff --git a/lesscpy/plib/mixin.py b/lesscpy/plib/mixin.py
index 916bb9e..9fed3a7 100644
--- a/lesscpy/plib/mixin.py
+++ b/lesscpy/plib/mixin.py
@@ -19,7 +19,7 @@ class Mixin(Process):
             @param list: current scope
         """
         self.stash = stash
-        self.name = self._p[1][0]
+        self._name = self._p[1][0].strip()
         if len(self._p[1]) > 1:
             if type(self._p[1][2]) is list:
                 self.argv = [[u[0], u[2]] if type(u) is list