diff --git a/Commands/New Function.tmCommand b/Commands/New Function.tmCommand
index 064d364..df612f6 100644
--- a/Commands/New Function.tmCommand	
+++ b/Commands/New Function.tmCommand	
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>beforeRunningCommand</key>
 	<string>nop</string>
 	<key>command</key>
 	<string>cat &lt;&lt;SNIPPET
-function ${TM_SELECTED_TEXT:-$TM_CURRENT_WORD}(\${1:args}) {
-	\$0
-}
+function ${TM_SELECTED_TEXT:-$TM_CURRENT_WORD}(\$1){\$0};
 SNIPPET</string>
 	<key>fallbackInput</key>
 	<string>word</string>
diff --git a/Commands/New Method.tmCommand b/Commands/New Method.tmCommand
index 2e02018..6d48573 100644
--- a/Commands/New Method.tmCommand	
+++ b/Commands/New Method.tmCommand	
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>beforeRunningCommand</key>
 	<string>nop</string>
 	<key>command</key>
 	<string>cat &lt;&lt;SNIPPET
-${TM_SELECTED_TEXT:-$TM_CURRENT_WORD}: function(\${1:args}) {
-	\$0
-}\${2:,}
-SNIPPET</string>
+${TM_SELECTED_TEXT:-$TM_CURRENT_WORD}: function(\$1){\$0},
+SNIPPET
+</string>
 	<key>fallbackInput</key>
 	<string>word</string>
 	<key>input</key>
diff --git a/Snippets/function (fun).plist b/Snippets/function (fun).plist
deleted file mode 100644
index f8a5177..0000000
--- a/Snippets/function (fun).plist	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>function ${1:function_name}(${2:argument}) {
-	${0:// body...}
-}</string>
-	<key>name</key>
-	<string>Function</string>
-	<key>scope</key>
-	<string>source.js</string>
-	<key>tabTrigger</key>
-	<string>fun</string>
-	<key>uuid</key>
-	<string>F0E4FB6A-4878-48C6-A777-62438DF1E14F</string>
-</dict>
-</plist>
diff --git a/Snippets/function.tmSnippet b/Snippets/function.tmSnippet
index f95fea1..b90dba6 100644
--- a/Snippets/function.tmSnippet
+++ b/Snippets/function.tmSnippet
@@ -3,14 +3,14 @@
 <plist version="1.0">
 <dict>
 	<key>content</key>
-	<string>function($1){${0:${TM_SELECTED_TEXT}}}</string>
+	<string>function$1($2){$0}</string>
 	<key>name</key>
-	<string>Anonymous Function</string>
+	<string>Function</string>
 	<key>scope</key>
 	<string>source.js</string>
 	<key>tabTrigger</key>
 	<string>f</string>
 	<key>uuid</key>
-	<string>4C6EDB43-3E2E-411B-A016-13C135C59833</string>
+	<string>F0E4FB6A-4878-48C6-A777-62438DF1E14F</string>
 </dict>
 </plist>