diff --git a/syntax/CurlyWASM.sublime-completions b/syntax/CurlyWASM.sublime-completions
index 4be26c5..7ec5882 100644
--- a/syntax/CurlyWASM.sublime-completions
+++ b/syntax/CurlyWASM.sublime-completions
@@ -4,25 +4,25 @@
         // Keywords
         {
             "trigger": "if",
-            "contents": "if (${1:condition}) { ${2:block} }",
+            "contents": "if (${1:condition}) {\n\t${2:// Your start code here}\n}",
             "details": "if (condition) { block }",
             "kind": "keyword"
         },
         {
             "trigger": "else",
-            "contents": "else { ${1:block} }",
+            "contents": "else {\n\t${1:// Your start code here}\n}",
             "details": "else { block }",
             "kind": "keyword"
         },
         {
             "trigger": "loop",
-            "contents": "loop ${1:label} { ${2:block} }",
+            "contents": "loop ${1:label} {\n\t${2:// Your start code here}\n}",
             "details": "loop label { block }",
             "kind": "keyword"
         },
         {
             "trigger": "fn",
-            "contents": "fn ${1:name}(${2:params}) ${3:-> ${4:return_type}} { ${5:block} }",
+            "contents": "fn ${1:name}(${2:params}) {\n\t${3:// Your start code here}\n}",
             "details": "fn name(params) [-> return_type] { block }",
             "kind": "keyword"
         },
@@ -74,12 +74,6 @@
             "details": "return [expression]",
             "kind": "keyword"
         },
-        {
-            "trigger": "block",
-            "contents": "block ${1:label} { ${2:block} }",
-            "details": "block label { block }",
-            "kind": "keyword"
-        },
         {
             "trigger": "branch",
             "contents": "branch ${1:label};",
@@ -88,7 +82,7 @@
         },
         {
             "trigger": "data",
-            "contents": "data ${1:address} { ${2:content} }",
+            "contents": "data ${1:address} {\n\t${2:content}\n}",
             "details": "data address { content }",
             "kind": "keyword"
         },
@@ -110,12 +104,6 @@
             "details": "Inline variable modifier",
             "kind": "storage.modifier"
         },
-        {
-            "trigger": "break",
-            "contents": "break;",
-            "details": "Break from block or loop",
-            "kind": "keyword"
-        },
 
         // Operators
         {
diff --git a/syntax/CurlyWASM.sublime-syntax b/syntax/CurlyWASM.sublime-syntax
index 23cb115..03179df 100644
--- a/syntax/CurlyWASM.sublime-syntax
+++ b/syntax/CurlyWASM.sublime-syntax
@@ -38,7 +38,7 @@ contexts:
       scope: storage.modifier.curlywasm
 
     # Control flow
-    - match: \b(return|if|else|loop|block|branch|branch_if|break)\b
+    - match: \b(return|if|else|loop|branch|branch_if)\b
       scope: keyword.control.flow.curlywasm
 
     # Type conversion