diff --git a/go-mode/f b/go-mode/f
index 4a1175ce..0b5782bb 100644
--- a/go-mode/f
+++ b/go-mode/f
@@ -1,6 +1,6 @@
 # -*- mode: snippet -*-
 # name: func ...(...) ... { ... }
 # --
-func ${1:name}(${2:args})${3: return type} {
+func ${1:name}(${2:args}) ${3:return type}{
     `%`$0
 }
\ No newline at end of file
diff --git a/go-mode/fm b/go-mode/fm
index a35ace16..612a0dbc 100644
--- a/go-mode/fm
+++ b/go-mode/fm
@@ -1,6 +1,6 @@
 # -*- mode: snippet -*-
 # name: func (target) name(args) (results) { ... }
 # --
-func (${1:target}) ${2:name}(${3:args})${4: return type} {
+func (${1:target}) ${2:name}(${3:args}) ${4:return type}{
     $0
 }
\ No newline at end of file
diff --git a/go-mode/func b/go-mode/func
index 4a1175ce..0b5782bb 100644
--- a/go-mode/func
+++ b/go-mode/func
@@ -1,6 +1,6 @@
 # -*- mode: snippet -*-
 # name: func ...(...) ... { ... }
 # --
-func ${1:name}(${2:args})${3: return type} {
+func ${1:name}(${2:args}) ${3:return type}{
     `%`$0
 }
\ No newline at end of file
diff --git a/go-mode/imp b/go-mode/imp
index d23663e4..70eb8ed6 100644
--- a/go-mode/imp
+++ b/go-mode/imp
@@ -1,4 +1,6 @@
 # -*- mode: snippet -*-
 # name: import
 # --
-import ${1:package}$0
\ No newline at end of file
+import (
+    ${1:package}$0
+)
\ No newline at end of file
diff --git a/go-mode/import b/go-mode/import
index d23663e4..70eb8ed6 100644
--- a/go-mode/import
+++ b/go-mode/import
@@ -1,4 +1,6 @@
 # -*- mode: snippet -*-
 # name: import
 # --
-import ${1:package}$0
\ No newline at end of file
+import (
+    ${1:package}$0
+)
\ No newline at end of file
diff --git a/go-mode/method b/go-mode/method
index a35ace16..612a0dbc 100644
--- a/go-mode/method
+++ b/go-mode/method
@@ -1,6 +1,6 @@
 # -*- mode: snippet -*-
 # name: func (target) name(args) (results) { ... }
 # --
-func (${1:target}) ${2:name}(${3:args})${4: return type} {
+func (${1:target}) ${2:name}(${3:args}) ${4:return type}{
     $0
 }
\ No newline at end of file
diff --git a/go-mode/struct b/go-mode/struct
index d0aa7cdf..a10a964c 100644
--- a/go-mode/struct
+++ b/go-mode/struct
@@ -1,6 +1,6 @@
 # -*- mode: snippet -*-
 # name: type ... struct { ... }
 # --
-type $1 struct {
+type ${1:name} struct {
     `%`$0
 }
\ No newline at end of file
diff --git a/go-mode/switch b/go-mode/switch
index 29ef0e85..9ec6afe1 100644
--- a/go-mode/switch
+++ b/go-mode/switch
@@ -3,7 +3,7 @@
 # key: switch
 # uuid: switch
 # --
-switch {
-    case ${1:cond}:
+switch ${1:express}{
+    case ${2:cond}:
          $0
 }
\ No newline at end of file
diff --git a/go-mode/type b/go-mode/type
new file mode 100644
index 00000000..e9e03331
--- /dev/null
+++ b/go-mode/type
@@ -0,0 +1,6 @@
+# -*- mode: snippet -*-
+# name: type ... ... { ... }
+# --
+type ${1:name} ${2:struct | interface} {
+    `%`$0
+}
\ No newline at end of file