diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 008fe0a2ca..bbb93b7fa2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -42,6 +42,9 @@ jobs:
       run: ./v test-fixed
     - name: Test building v tools
       run: ./v build-tools
+    - name: v vet
+      run: |
+        v vet vlib/v/parser
 #    - name: Test v binaries
 #      run: ./v -silent build-vbinaries
 
@@ -59,7 +62,7 @@ jobs:
       uses: spytheman/docker_alpine_v@v7.0
       with:
         entrypoint: .github/workflows/alpine.build.sh
-        
+
     - name: Test V
       uses: spytheman/docker_alpine_v@v7.0
       with:
@@ -148,7 +151,7 @@ jobs:
         git clone --depth 1 https://github.com/vlang/gitly
         ./v install markdown
         cd gitly
-        ../v . 
+        ../v .
         ../v -autofree .
         cd ..
 #    - name: Build vpm
diff --git a/vlib/v/fmt/tests/comments_keep.vv b/vlib/v/fmt/tests/comments_keep.vv
new file mode 100644
index 0000000000..3dbdd20185
--- /dev/null
+++ b/vlib/v/fmt/tests/comments_keep.vv
@@ -0,0 +1,7 @@
+struct User {
+	name string // name
+	// last comment
+	// last comment2
+}
+
+
diff --git a/vlib/v/parser/fn.v b/vlib/v/parser/fn.v
index 61cea6627e..136e34db6e 100644
--- a/vlib/v/parser/fn.v
+++ b/vlib/v/parser/fn.v
@@ -220,7 +220,8 @@ fn (mut p Parser) fn_decl() ast.FnDecl {
 	mut end_pos := p.prev_tok.position()
 	// Return type
 	mut return_type := table.void_type
-	if p.tok.kind.is_start_of_type() || (p.tok.kind == .key_fn && p.tok.line_nr == p.prev_tok.line_nr) {
+	if p.tok.kind.is_start_of_type() || (p.tok.kind == .key_fn &&
+		p.tok.line_nr == p.prev_tok.line_nr) {
 		end_pos = p.tok.position()
 		return_type = p.parse_type()
 	}
@@ -228,7 +229,7 @@ fn (mut p Parser) fn_decl() ast.FnDecl {
 	// Register
 	if is_method {
 		mut type_sym := p.table.get_type_symbol(rec_type)
-		//		p.warn('reg method $type_sym.name . $name ()')
+		// p.warn('reg method $type_sym.name . $name ()')
 		type_sym.register_method(table.Fn{
 			name: name
 			args: args
@@ -251,7 +252,7 @@ fn (mut p Parser) fn_decl() ast.FnDecl {
 		if _ := p.table.find_fn(name) {
 			p.fn_redefinition_error(name)
 		}
-		//p.warn('reg functn $name ()')
+		// p.warn('reg functn $name ()')
 		p.table.register_fn(table.Fn{
 			name: name
 			args: args
@@ -273,10 +274,13 @@ fn (mut p Parser) fn_decl() ast.FnDecl {
 	if p.tok.kind == .lcbr {
 		stmts = p.parse_block_no_scope(true)
 		// Add return if `fn(...) ? {...}` have no return at end
-        if return_type != table.void_type && p.table.get_type_symbol(return_type).kind == .void &&
-                return_type.has_flag(.optional) && (stmts.len == 0 || stmts[stmts.len-1] !is ast.Return) {
-            stmts << ast.Return{ pos: p.tok.position() }
-        }
+		if return_type != table.void_type &&
+			p.table.get_type_symbol(return_type).kind == .void && return_type.has_flag(.optional) &&
+			(stmts.len == 0 || stmts[stmts.len - 1] !is ast.Return) {
+			stmts << ast.Return{
+				pos: p.tok.position()
+			}
+		}
 	}
 	p.close_scope()
 	if !no_body && are_args_type_only {
@@ -376,7 +380,8 @@ fn (mut p Parser) fn_args() ([]table.Arg, bool, bool) {
 	mut is_variadic := false
 	// `int, int, string` (no names, just types)
 	argname := if p.tok.kind == .name && p.tok.lit.len > 0 && p.tok.lit[0].is_capital() { p.prepend_mod(p.tok.lit) } else { p.tok.lit }
-	types_only := p.tok.kind in [.amp, .ellipsis, .key_fn] || (p.peek_tok.kind == .comma && p.table.known_type(argname)) ||
+	types_only := p.tok.kind in [.amp, .ellipsis, .key_fn] ||
+		(p.peek_tok.kind == .comma && p.table.known_type(argname)) ||
 		p.peek_tok.kind == .rpar
 	// TODO copy pasta, merge 2 branches
 	if types_only {