diff --git a/UltiSnips/all.snippets b/UltiSnips/all.snippets
index 31665b8..687541a 100644
--- a/UltiSnips/all.snippets
+++ b/UltiSnips/all.snippets
@@ -27,18 +27,15 @@ class Comment(object):
 endglobal
 
 snippet todo "TODO commment"
-`!p comment=Comment()
-snip.rv=comment.before()`TODO${1/.+/(/}$1${1/.+/)/}: $0`!p snip.rv=comment.after()`
+`!p comment=Comment();snip.rv=comment.before()`TODO${1/.+/(/}$1${1/.+/)/}: $0`!p snip.rv=comment.after()`
 endsnippet
 
 snippet fixme "FIXME comment"
-`!p comment=Comment()
-snip.rv=comment.before()`FIXME${1/.+/(/}$1${1/.+/)/}: $0`!p snip.rv=comment.after()`
+`!p comment=Comment();snip.rv=comment.before()`FIXME${1/.+/(/}$1${1/.+/)/}: $0`!p snip.rv=comment.after()`
 endsnippet
 
 snippet note "NOTE comment"
-`!p comment=Comment()
-snip.rv=comment.before()`NOTE: $0`!p snip.rv=comment.after()`
+`!p comment=Comment();snip.rv=comment.before()`NOTE: $0`!p snip.rv=comment.after()`
 endsnippet
 
 global !p