diff --git a/cmd/tools/bench/wyhash.v b/cmd/tools/bench/wyhash.v
index c11f4b29cf..68806ca721 100644
--- a/cmd/tools/bench/wyhash.v
+++ b/cmd/tools/bench/wyhash.v
@@ -1,11 +1,9 @@
 module main
 
-import (
-	hash.fnv1a
-	hash.wyhash
-	rand
-	time
-)
+import hash.fnv1a
+import hash.wyhash
+import rand
+import time
 
 fn main() {
 	sample_size := 10000000
diff --git a/cmd/tools/fast/fast.v b/cmd/tools/fast/fast.v
index beaaca7cc6..0bedeb7596 100644
--- a/cmd/tools/fast/fast.v
+++ b/cmd/tools/fast/fast.v
@@ -2,10 +2,8 @@
 // Use of this source code is governed by an MIT license
 // that can be found in the LICENSE file.
 
-import (
-	os
-	time
-)
+import os
+import time
 
 fn main() {
 	exe := os.executable()
diff --git a/cmd/tools/gen_vc.v b/cmd/tools/gen_vc.v
index 1266050888..1eeca0d308 100644
--- a/cmd/tools/gen_vc.v
+++ b/cmd/tools/gen_vc.v
@@ -16,14 +16,12 @@
 
 module main
 
-import (
-	os
-	log
-	flag
-	time
-	vweb
-	net.urllib
-)
+import os
+import log
+import flag
+import time
+import vweb
+import net.urllib
 
 // git credentials
 const(
diff --git a/cmd/tools/modules/testing/common.v b/cmd/tools/modules/testing/common.v
index 1df00da555..9b1333d7e1 100644
--- a/cmd/tools/modules/testing/common.v
+++ b/cmd/tools/modules/testing/common.v
@@ -1,12 +1,10 @@
 module testing
 
-import (
-	os
-	term
-	benchmark
-	sync
-	v.pref
-)
+import os
+import term
+import benchmark
+import sync
+import v.pref
 
 pub struct TestMessageHandler {
 mut:
diff --git a/cmd/tools/oldv.v b/cmd/tools/oldv.v
index 78de60873b..1a3d3252dc 100644
--- a/cmd/tools/oldv.v
+++ b/cmd/tools/oldv.v
@@ -1,9 +1,7 @@
-import (
-	os
-	flag
-	scripting
-	vgit
-)
+import os
+import flag
+import scripting
+import vgit
 
 const (
 	tool_version = '0.0.3'
diff --git a/cmd/tools/performance_compare.v b/cmd/tools/performance_compare.v
index 73ee21730d..d619e8cb62 100644
--- a/cmd/tools/performance_compare.v
+++ b/cmd/tools/performance_compare.v
@@ -1,9 +1,7 @@
-import (
-	os
-	flag
-	scripting
-	vgit
-)
+import os
+import flag
+import scripting
+import vgit
 
 const (
 	tool_version = '0.0.5'
diff --git a/cmd/tools/preludes/tests_with_stats.v b/cmd/tools/preludes/tests_with_stats.v
index 40e629fc01..485777a048 100644
--- a/cmd/tools/preludes/tests_with_stats.v
+++ b/cmd/tools/preludes/tests_with_stats.v
@@ -7,10 +7,8 @@ module main
 // / look & feel of the results is easy, since it is done in normal V
 // / code, instead of in embedded C ...
 // /////////////////////////////////////////////////////////////////////
-import (
-	os
-	benchmark
-)
+import os
+import benchmark
 
 const (
 	INNER_INDENT = '     '
diff --git a/cmd/tools/vbuild-examples.v b/cmd/tools/vbuild-examples.v
index 1f856f30b0..b7e6bdbf88 100644
--- a/cmd/tools/vbuild-examples.v
+++ b/cmd/tools/vbuild-examples.v
@@ -1,9 +1,7 @@
 module main
 
-import (
-	os
-	testing
-)
+import os
+import testing
 
 fn main() {
 	args := os.args
diff --git a/cmd/tools/vbuild-tools.v b/cmd/tools/vbuild-tools.v
index 4aaaf6b638..93175abf3c 100644
--- a/cmd/tools/vbuild-tools.v
+++ b/cmd/tools/vbuild-tools.v
@@ -1,9 +1,7 @@
 module main
 
-import (
-	os
-	testing
-)
+import os
+import testing
 
 fn main() {
 	args := os.args
diff --git a/cmd/tools/vcreate.v b/cmd/tools/vcreate.v
index 251e2f53e8..356f981d45 100644
--- a/cmd/tools/vcreate.v
+++ b/cmd/tools/vcreate.v
@@ -8,9 +8,7 @@
 // functionality is essentially the same.
 module main
 
-import (
-	os
-)
+import os
 
 struct Create {
 mut:
diff --git a/cmd/tools/vnames.v b/cmd/tools/vnames.v
index 66fd42fbaa..6d8c787fed 100644
--- a/cmd/tools/vnames.v
+++ b/cmd/tools/vnames.v
@@ -2,13 +2,11 @@ module main
 
 /*
 QTODO
-import (
-	os
-	flag
-	strings
-	compiler
-	v.pref
-)
+import os
+import flag
+import strings
+import compiler
+import v.pref
 
 const (
 	tool_version = '0.0.1'
diff --git a/cmd/tools/vpm.v b/cmd/tools/vpm.v
index 859022901d..f35534d0ee 100644
--- a/cmd/tools/vpm.v
+++ b/cmd/tools/vpm.v
@@ -1,12 +1,10 @@
 module main
 
-import (
-	net.http
-	os
-	os.cmdline
-	json
-	vhelp
-)
+import os
+import os.cmdline
+import net.http
+import json
+import vhelp
 
 const (
 	default_vpm_server_urls = ['https://vpm.best', 'https://vpm.vlang.io']
diff --git a/cmd/tools/vrepl.v b/cmd/tools/vrepl.v
index dd7d337b71..576a8558f5 100644
--- a/cmd/tools/vrepl.v
+++ b/cmd/tools/vrepl.v
@@ -4,13 +4,11 @@
 
 module main
 
-import (
-	os
-	term
-	readline
-	os.cmdline
-	v.util
-)
+import os
+import term
+import readline
+import os.cmdline
+import v.util
 
 struct Repl {
 mut:
diff --git a/cmd/tools/vself.v b/cmd/tools/vself.v
index 5a964c42f3..dec64cf9d2 100644
--- a/cmd/tools/vself.v
+++ b/cmd/tools/vself.v
@@ -1,9 +1,7 @@
 module main
 
-import (
-	os
-	v.pref
-)
+import os
+import v.pref
 
 fn main() {
 	vexe := pref.vexe_path()
diff --git a/cmd/tools/vsetup-freetype.v b/cmd/tools/vsetup-freetype.v
index 4e551c78d4..aafe29825d 100644
--- a/cmd/tools/vsetup-freetype.v
+++ b/cmd/tools/vsetup-freetype.v
@@ -1,9 +1,7 @@
 module main
 
-import (
-	os
-	v.pref
-)
+import os
+import v.pref
 
 fn main() {
 	$if windows {
diff --git a/cmd/tools/vtest-compiler.v b/cmd/tools/vtest-compiler.v
index 82edca4fcf..c3f5705138 100644
--- a/cmd/tools/vtest-compiler.v
+++ b/cmd/tools/vtest-compiler.v
@@ -1,11 +1,9 @@
 module main
 
-import (
-	os
-	testing
-	benchmark
-	v.pref
-)
+import os
+import testing
+import benchmark
+import v.pref
 
 fn main() {
 	args := os.args
diff --git a/cmd/tools/vtest-fmt.v b/cmd/tools/vtest-fmt.v
index ad1350906b..a0dc6ce264 100644
--- a/cmd/tools/vtest-fmt.v
+++ b/cmd/tools/vtest-fmt.v
@@ -1,9 +1,7 @@
 module main
 
-import (
-	os
-	testing
-)
+import os
+import testing
 
 const (
 	known_failing_exceptions = ['./examples/vweb/vweb_example.v',
diff --git a/cmd/tools/vup.v b/cmd/tools/vup.v
index 4c47e6eb7c..07050b3618 100644
--- a/cmd/tools/vup.v
+++ b/cmd/tools/vup.v
@@ -1,10 +1,8 @@
 module main
 
-import (
-	os
-	v.pref
-	v.util
-)
+import os
+import v.pref
+import v.util
 
 fn main() {
 	vroot := os.dir(pref.vexe_path())