diff --git a/go-mode/default b/go-mode/default
new file mode 100644
index 0000000..e0cd749
--- /dev/null
+++ b/go-mode/default
@@ -0,0 +1,6 @@
+# -*- mode: snippet -*-
+# name: default
+# key: def
+# --
+default:
+$0
\ No newline at end of file
diff --git a/go-mode/else b/go-mode/else
index 1ad64f1..7f71305 100644
--- a/go-mode/else
+++ b/go-mode/else
@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
 # name: else
-# key: else
+# key: el
 # --
-else {
+ else {
   $0
 }
\ No newline at end of file
diff --git a/go-mode/if b/go-mode/if
index ea01292..569c1d5 100644
--- a/go-mode/if
+++ b/go-mode/if
@@ -4,4 +4,4 @@
 # --
 if $1 {
   $0
-}
+}
\ No newline at end of file
diff --git a/go-mode/select b/go-mode/select
index 9724530..1db4b3c 100644
--- a/go-mode/select
+++ b/go-mode/select
@@ -1,6 +1,6 @@
 # -*- mode: snippet -*-
 # name: select
-# key: select
+# key: sel
 # --
 select {
 case $1:
diff --git a/go-mode/switch b/go-mode/switch
index 845df73..95c9dd7 100644
--- a/go-mode/switch
+++ b/go-mode/switch
@@ -1,8 +1,8 @@
 # -*- mode: snippet -*-
 # name: switch
-# key: switch
+# key: sw
 # --
 switch $1 {
-  case $2:
-    $0
-}
+case $2:
+  $0
+}
\ No newline at end of file
diff --git a/go-mode/{ b/go-mode/{
deleted file mode 100644
index f5e337b..0000000
--- a/go-mode/{
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: {
-# key: {
-# contributor : grafov
-# --
-{
-  $0
-}
\ No newline at end of file