diff --git a/UltiSnips/all.snippets b/UltiSnips/all.snippets
index d5dbed7..273b631 100644
--- a/UltiSnips/all.snippets
+++ b/UltiSnips/all.snippets
@@ -1,3 +1,22 @@
 snippet tab "Insert tab literal"
 	$0
 endsnippet
+
+global !p
+comment=vim.current.buffer.options['commentstring'].strip()
+def commentbefore():
+	return comment[0:comment.find('%s')].strip() + ' '
+def commentafter():
+	after=comment[comment.find('%s')+2:].strip()
+	if 0 < len(after):
+		return ' ' + after
+	return ''
+endglobal
+
+snippet todo "TODO commment"
+`!p snip.rv=commentbefore()`TODO$1: $0`!p snip.rv=commentafter()`
+endsnippet
+
+snippet note "NOTE comment"
+`!p snip.rv=commentbefore()`NOTE: $0`!p snip.rv=commentafter()`
+endsnippet
diff --git a/UltiSnips/c.snippets b/UltiSnips/c.snippets
index b7708ff..c984405 100644
--- a/UltiSnips/c.snippets
+++ b/UltiSnips/c.snippets
@@ -155,26 +155,6 @@ int main(int argc, char **argv) {
 }
 endsnippet
 
-# TODO: Should this be in all.snippets?
-# 1. Take the form '<comment> TODO: issue ${1:id} $0'
-snippet todo "Todo comment"
-// TODO$1: $0
-endsnippet
-
-# TODO: Should this be in all.snippets?
-# 1. Take the form '<comment> NOTE: issue ${1:id} $0'
-snippet note "Note comment"
-// NOTE$1: $0
-endsnippet
-
-snippet in "Doxygen [in]" i
-[in]
-endsnippet
-
-snippet out "Doxygen [out]" i
-[out]
-endsnippet
-
 snippet @param "Doxygen param tag"
 @param[$1`!p snip.rv = complete(t[1], ['in', 'out'])`]
 endsnippet
diff --git a/UltiSnips/cmake.snippets b/UltiSnips/cmake.snippets
index 4343b3a..f280357 100644
--- a/UltiSnips/cmake.snippets
+++ b/UltiSnips/cmake.snippets
@@ -814,7 +814,3 @@ while(${1:condition})
 	$0
 endwhile()
 endsnippet
-
-snippet todo "TODO"
-# TODO$1: $0
-endsnippet
diff --git a/after/ftplugin/cmake.vim b/after/ftplugin/cmake.vim
index f68caa2..2095f62 100644
--- a/after/ftplugin/cmake.vim
+++ b/after/ftplugin/cmake.vim
@@ -12,3 +12,5 @@
 "
 "   setlocal foldmethod=syntax
 setlocal foldmethod=indent
+" Set comment string
+setlocal commentstring=#%s