diff --git a/snippets/text-mode/python-mode/class b/snippets/text-mode/python-mode/class
index 0a3bff4..0fafc4a 100644
--- a/snippets/text-mode/python-mode/class
+++ b/snippets/text-mode/python-mode/class
@@ -1,14 +1,53 @@
-#original contributor : Orestis Markou
-#contributor : Nishio Hirokazu
-#name : class ... :
+# name: class
+# contributor: Orestis Markou
+# contributor: Nishio Hirokazu
+# contributor: Yasser González Fernández <yglez@uh.cu>
 # --
 class ${1:ClassName}(${2:object}):
-    "docstring for $1"
-    def __init__(self, ${3:args}):
-        ${3:$
-(mapconcat
- '(lambda (x)  (concat "self." x " = " x))
- (split-string text ", ")
- (concat "\n" (make-string (current-column) 32)))
-}
-        $0
+   """$3
+   """
+
+   def __init__(self, $4):
+       """$5
+       ${4:$
+       (let* ((indent
+               (concat "\n" (make-string (current-column) 32)))
+              (args
+               (mapconcat
+                '(lambda (x)
+                   (if (not (string= (nth 0 x) ""))
+                       (concat "- " (char-to-string 96) (nth 0 x)
+                               (char-to-string 96) ":")))
+                (mapcar
+                 '(lambda (x)
+                    (mapcar
+                     (lambda (x)
+                       (replace-regexp-in-string "\s*$" ""
+                        (replace-regexp-in-string "^\s*" "" x))) x))
+                 (mapcar '(lambda (x) (split-string x "="))
+                         (split-string text ",")))
+                indent)))
+         (if (string= args "")
+             (make-string 3 34)
+           (mapconcat
+            'identity
+            (list "" "Arguments:" args (make-string 3 34))
+            indent)))
+       }
+       ${4:$
+       (mapconcat
+        '(lambda (x)
+           (if (not (string= (nth 0 x) ""))
+               (concat "self._" (nth 0 x) " = " (nth 0 x))))
+        (mapcar
+         '(lambda (x)
+            (mapcar
+             '(lambda (x)
+                (replace-regexp-in-string "\s*$" ""
+                 (replace-regexp-in-string "^\s*" "" x)))
+             x))
+         (mapcar '(lambda (x) (split-string x "="))
+                 (split-string text ",")))
+        (concat "\n" (make-string (current-column) 32)))
+       }
+       $0
diff --git a/snippets/text-mode/python-mode/def b/snippets/text-mode/python-mode/def
index 70e248c..5444d10 100644
--- a/snippets/text-mode/python-mode/def
+++ b/snippets/text-mode/python-mode/def
@@ -1,6 +1,33 @@
-#contributor : Orestis Markou
-#name : def ... :
+# name: def
+# contributor: Orestis Markou
+# contributor: Yasser González Fernández <yglez@uh.cu>
 # --
-def ${1:fname}(${self}):
-    "docstring for $1"
-    ${pass}$0
\ No newline at end of file
+def ${1:name}($2):
+   """$3
+   ${2:$
+   (let* ((indent
+           (concat "\n" (make-string (current-column) 32)))
+          (args
+           (mapconcat
+            '(lambda (x)
+               (if (not (string= (nth 0 x) ""))
+                   (concat "- " (char-to-string 96) (nth 0 x)
+                           (char-to-string 96) ":")))
+            (mapcar
+             '(lambda (x)
+                (mapcar
+                 '(lambda (x)
+                    (replace-regexp-in-string "\s*$" ""
+                     (replace-regexp-in-string "^\s*" "" x)))
+                 x))
+             (mapcar '(lambda (x) (split-string x "="))
+                     (split-string text ",")))
+            indent)))
+     (if (string= args "")
+         (make-string 3 34)
+       (mapconcat
+        'identity
+        (list "" "Arguments:" args (make-string 3 34))
+        indent)))
+   }
+   $0
diff --git a/snippets/text-mode/python-mode/defm b/snippets/text-mode/python-mode/defm
new file mode 100644
index 0000000..088cb71
--- /dev/null
+++ b/snippets/text-mode/python-mode/defm
@@ -0,0 +1,32 @@
+# name: defm
+# contributor: Yasser Gonz¨¢lez Fern¨¢ndez <yglez@uh.cu>
+# --
+def ${1:name}(self, $2):
+   """$3
+   ${2:$
+   (let* ((indent
+           (concat "\n" (make-string (current-column) 32)))
+          (args
+           (mapconcat
+            '(lambda (x)
+               (if (not (string= (nth 0 x) ""))
+                   (concat "- " (char-to-string 96) (nth 0 x)
+                           (char-to-string 96) ":")))
+            (mapcar
+             '(lambda (x)
+                (mapcar
+                 '(lambda (x)
+                    (replace-regexp-in-string "\s*$" ""
+                     (replace-regexp-in-string "^\s*" "" x)))
+                 x))
+             (mapcar '(lambda (x) (split-string x "="))
+                     (split-string text ",")))
+            indent)))
+     (if (string= args "")
+         (make-string 3 34)
+       (mapconcat
+        'identity
+        (list "" "Arguments:" args (make-string 3 34))
+        indent)))
+   }
+   $0