diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 834fba9b..875cf64a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -51,6 +51,8 @@ jobs:
         args: --build-tags no_cgo
         # https://github.com/golangci/golangci-lint-action/issues/244
         skip-cache: true
+    - name: Run Go Fix
+      run: make go-fix
     - name: Run incorrect builds
       run: |
         echo "::remove-matcher owner=go::"
diff --git a/Makefile b/Makefile
index d5984938..1fdd5cd5 100644
--- a/Makefile
+++ b/Makefile
@@ -80,9 +80,14 @@ go-tidy:
 	go mod tidy -v
 	git diff --exit-code
 
+.PHONY: go-fix
+go-fix:
+	go fix ./...
+	git diff --exit-code
+
 # Go lint
 .PHONY: go-lint
-go-lint: go-tidy
+go-lint: go-tidy go-fix
 	# revive -config revive.toml
 	golangci-lint run -v ./...
 	
diff --git a/bls.go b/bls.go
index 4cb7feba..e371c60e 100644
--- a/bls.go
+++ b/bls.go
@@ -1,5 +1,4 @@
 //go:build cgo && !no_cgo
-// +build cgo,!no_cgo
 
 /*
  * Flow Crypto
diff --git a/bls12381_utils.go b/bls12381_utils.go
index 50177061..e504a914 100644
--- a/bls12381_utils.go
+++ b/bls12381_utils.go
@@ -1,5 +1,4 @@
 //go:build cgo && !no_cgo
-// +build cgo,!no_cgo
 
 /*
  * Flow Crypto
diff --git a/bls12381_utils_test.go b/bls12381_utils_test.go
index e057b52a..5fd58471 100644
--- a/bls12381_utils_test.go
+++ b/bls12381_utils_test.go
@@ -1,5 +1,4 @@
 //go:build cgo && !no_cgo
-// +build cgo,!no_cgo
 
 /*
  * Flow Crypto
diff --git a/bls_crossBLST_test.go b/bls_crossBLST_test.go
index 3919863c..b5f47f60 100644
--- a/bls_crossBLST_test.go
+++ b/bls_crossBLST_test.go
@@ -1,5 +1,4 @@
 //go:build cgo && !no_cgo
-// +build cgo,!no_cgo
 
 /*
  * Flow Crypto
diff --git a/bls_multisig.go b/bls_multisig.go
index 0caa0997..dbb1625e 100644
--- a/bls_multisig.go
+++ b/bls_multisig.go
@@ -1,5 +1,4 @@
 //go:build cgo && !no_cgo
-// +build cgo,!no_cgo
 
 /*
  * Flow Crypto
diff --git a/bls_test.go b/bls_test.go
index 2cf85d5a..7a4902dd 100644
--- a/bls_test.go
+++ b/bls_test.go
@@ -1,5 +1,4 @@
 //go:build cgo && !no_cgo
-// +build cgo,!no_cgo
 
 /*
  * Flow Crypto
diff --git a/bls_thresholdsign.go b/bls_thresholdsign.go
index 682c9db2..c7de6761 100644
--- a/bls_thresholdsign.go
+++ b/bls_thresholdsign.go
@@ -1,5 +1,4 @@
 //go:build cgo && !no_cgo
-// +build cgo,!no_cgo
 
 /*
  * Flow Crypto
diff --git a/bls_thresholdsign_test.go b/bls_thresholdsign_test.go
index 279813cc..745d8d87 100644
--- a/bls_thresholdsign_test.go
+++ b/bls_thresholdsign_test.go
@@ -1,5 +1,4 @@
 //go:build cgo && !no_cgo
-// +build cgo,!no_cgo
 
 /*
  * Flow Crypto
diff --git a/dkg_feldmanvss.go b/dkg_feldmanvss.go
index bff46742..696e9050 100644
--- a/dkg_feldmanvss.go
+++ b/dkg_feldmanvss.go
@@ -1,5 +1,4 @@
 //go:build cgo && !no_cgo
-// +build cgo,!no_cgo
 
 /*
  * Flow Crypto
diff --git a/dkg_feldmanvssq.go b/dkg_feldmanvssq.go
index 19cb29f9..61e81049 100644
--- a/dkg_feldmanvssq.go
+++ b/dkg_feldmanvssq.go
@@ -1,5 +1,4 @@
 //go:build cgo && !no_cgo
-// +build cgo,!no_cgo
 
 /*
  * Flow Crypto
diff --git a/dkg_jointfeldman.go b/dkg_jointfeldman.go
index 51e80323..3f82f5b6 100644
--- a/dkg_jointfeldman.go
+++ b/dkg_jointfeldman.go
@@ -1,5 +1,4 @@
 //go:build cgo && !no_cgo
-// +build cgo,!no_cgo
 
 /*
  * Flow Crypto
diff --git a/dkg_test.go b/dkg_test.go
index 8226b07b..d9dab748 100644
--- a/dkg_test.go
+++ b/dkg_test.go
@@ -1,5 +1,4 @@
 //go:build cgo && !no_cgo
-// +build cgo,!no_cgo
 
 /*
  * Flow Crypto
diff --git a/hash/keccakf.go b/hash/keccakf.go
index deb3c8c0..ba5cb64c 100644
--- a/hash/keccakf.go
+++ b/hash/keccakf.go
@@ -1,5 +1,4 @@
 //go:build !amd64 || purego || !gc
-// +build !amd64 purego !gc
 
 /*
  * Flow Crypto
diff --git a/hash/keccakf_asm.go b/hash/keccakf_asm.go
index c9e5714e..2c7f9ade 100644
--- a/hash/keccakf_asm.go
+++ b/hash/keccakf_asm.go
@@ -1,5 +1,4 @@
 //go:build amd64 && !purego && gc
-// +build amd64,!purego,gc
 
 /*
  * Flow Crypto
diff --git a/hash/xor_generic.go b/hash/xor_generic.go
index fbb60af2..613691f9 100644
--- a/hash/xor_generic.go
+++ b/hash/xor_generic.go
@@ -1,5 +1,4 @@
 //go:build (!amd64 && !386 && !ppc64le) || purego
-// +build !amd64,!386,!ppc64le purego
 
 /*
  * Flow Crypto
diff --git a/hash/xor_unaligned.go b/hash/xor_unaligned.go
index ca311265..666e4bb5 100644
--- a/hash/xor_unaligned.go
+++ b/hash/xor_unaligned.go
@@ -1,6 +1,4 @@
 //go:build (amd64 || 386 || ppc64le) && !purego
-// +build amd64 386 ppc64le
-// +build !purego
 
 /*
  * Flow Crypto
diff --git a/internal/blst/non_cgo.go b/internal/blst/non_cgo.go
index 6372919b..324387c6 100644
--- a/internal/blst/non_cgo.go
+++ b/internal/blst/non_cgo.go
@@ -1,4 +1,3 @@
 //go:build !cgo && no_cgo
-// +build !cgo,no_cgo
 
 package blst
diff --git a/no_cgo.go b/no_cgo.go
index 3726a17c..fd95f65c 100644
--- a/no_cgo.go
+++ b/no_cgo.go
@@ -1,5 +1,4 @@
 //go:build !cgo && no_cgo
-// +build !cgo,no_cgo
 
 package crypto
 
diff --git a/no_cgo_test.go b/no_cgo_test.go
index 8e634dad..efc32a29 100644
--- a/no_cgo_test.go
+++ b/no_cgo_test.go
@@ -1,5 +1,4 @@
 //go:build !cgo && no_cgo
-// +build !cgo,no_cgo
 
 package crypto_test
 
diff --git a/spock.go b/spock.go
index c2c2e493..96f1a593 100644
--- a/spock.go
+++ b/spock.go
@@ -1,5 +1,4 @@
 //go:build cgo && !no_cgo
-// +build cgo,!no_cgo
 
 /*
  * Flow Crypto
diff --git a/spock_test.go b/spock_test.go
index 16539589..1bf8d808 100644
--- a/spock_test.go
+++ b/spock_test.go
@@ -1,5 +1,4 @@
 //go:build cgo && !no_cgo
-// +build cgo,!no_cgo
 
 /*
  * Flow Crypto