diff --git a/dh/sidh/internal/templates/gen.go b/dh/sidh/internal/templates/gen.go
index e516b249d..b5dfe039c 100644
--- a/dh/sidh/internal/templates/gen.go
+++ b/dh/sidh/internal/templates/gen.go
@@ -8,7 +8,9 @@
 package main
 
 import (
+	"bytes"
 	"fmt"
+	"go/format"
 	"os"
 	"strings"
 	"text/template"
@@ -47,22 +49,36 @@ var opt_arm = map[string]bool{
 // Generates an 'fileNameBase.go' from 'fileNameBase.gotemp' file
 // for a given finite 'field'. Maps placeholders to 'values'.
 func gen(field, fileNameBase string, values interface{}) {
+	// Template files are located in ../templates and have
+	// extension .gotemp
+	templateFile := "../templates/" + fileNameBase + ".gotemp"
+	t, err := template.ParseFiles(templateFile)
+	if err != nil {
+		panic(fmt.Sprintf("Cannot open template file %s", templateFile))
+	}
+	var buf bytes.Buffer
+	err = t.Execute(&buf, values)
+	if err != nil {
+		panic("bad template execution")
+	}
+
+	// Formating output code
+	code, err := format.Source(buf.Bytes())
+	if err != nil {
+		panic("error formating code")
+	}
+
 	// name of the output .go file
 	outFileName := fileNameBase + ".go"
 	out, err := os.Create(outFileName)
 	if err != nil {
 		panic("Cannot open file")
 	}
-
-	// Template files are located in ../templates and have
-	// extension .gotemp
-	templateFile := "../templates/" + fileNameBase + ".gotemp"
-	t, err := template.ParseFiles(templateFile)
+	_, err = out.Write(code)
 	if err != nil {
-		panic(fmt.Sprintf("Cannot open template file %s", templateFile))
+		panic("error writing code")
 	}
 
-	t.Execute(out, values)
 	err = out.Close()
 	if err != nil {
 		panic("Cant close generated file")
diff --git a/kem/kyber/gen.go b/kem/kyber/gen.go
index b2c84d85d..1abca8e5e 100644
--- a/kem/kyber/gen.go
+++ b/kem/kyber/gen.go
@@ -7,6 +7,7 @@ package main
 
 import (
 	"bytes"
+	"go/format"
 	"io/ioutil"
 	"strings"
 	"text/template"
@@ -47,7 +48,13 @@ func generatePackageFiles() {
 			panic(err)
 		}
 
-		res := string(buf.Bytes())
+		// Formating output code
+		code, err := format.Source(buf.Bytes())
+		if err != nil {
+			panic("error formating code")
+		}
+
+		res := string(code)
 		offset := strings.Index(res, TemplateWarning)
 		if offset == -1 {
 			panic("Missing template warning in pkg.templ.go")
diff --git a/kem/kyber/kyber1024/kyber.go b/kem/kyber/kyber1024/kyber.go
index d7caf1185..223c842ed 100644
--- a/kem/kyber/kyber1024/kyber.go
+++ b/kem/kyber/kyber1024/kyber.go
@@ -12,10 +12,10 @@ import (
 	"crypto/subtle"
 	"io"
 
+	cryptoRand "crypto/rand"
 	"github.com/cloudflare/circl/internal/sha3"
 	"github.com/cloudflare/circl/kem"
 	cpapke "github.com/cloudflare/circl/pke/kyber/kyber1024"
-	cryptoRand "crypto/rand"
 )
 
 const (
diff --git a/kem/kyber/kyber512/kyber.go b/kem/kyber/kyber512/kyber.go
index bce6b070c..8cc1ec766 100644
--- a/kem/kyber/kyber512/kyber.go
+++ b/kem/kyber/kyber512/kyber.go
@@ -12,10 +12,10 @@ import (
 	"crypto/subtle"
 	"io"
 
+	cryptoRand "crypto/rand"
 	"github.com/cloudflare/circl/internal/sha3"
 	"github.com/cloudflare/circl/kem"
 	cpapke "github.com/cloudflare/circl/pke/kyber/kyber512"
-	cryptoRand "crypto/rand"
 )
 
 const (
diff --git a/kem/kyber/kyber768/kyber.go b/kem/kyber/kyber768/kyber.go
index b7581284a..98c402799 100644
--- a/kem/kyber/kyber768/kyber.go
+++ b/kem/kyber/kyber768/kyber.go
@@ -12,10 +12,10 @@ import (
 	"crypto/subtle"
 	"io"
 
+	cryptoRand "crypto/rand"
 	"github.com/cloudflare/circl/internal/sha3"
 	"github.com/cloudflare/circl/kem"
 	cpapke "github.com/cloudflare/circl/pke/kyber/kyber768"
-	cryptoRand "crypto/rand"
 )
 
 const (
diff --git a/kem/sike/gen.go b/kem/sike/gen.go
index 2e0346d65..603fc9a44 100644
--- a/kem/sike/gen.go
+++ b/kem/sike/gen.go
@@ -8,6 +8,7 @@ package main
 import (
 	"bytes"
 	"fmt"
+	"go/format"
 	"io/ioutil"
 	"strings"
 	"text/template"
@@ -56,7 +57,13 @@ func generatePackageFiles() {
 			panic(err)
 		}
 
-		res := string(buf.Bytes())
+		// Formating output code
+		code, err := format.Source(buf.Bytes())
+		if err != nil {
+			panic("error formating code")
+		}
+
+		res := string(code)
 		offset := strings.Index(res, TemplateWarning)
 		if offset == -1 {
 			panic("Missing template warning in pkg.templ.go")
diff --git a/pke/kyber/gen.go b/pke/kyber/gen.go
index 82df37e9a..62ed3ef27 100644
--- a/pke/kyber/gen.go
+++ b/pke/kyber/gen.go
@@ -8,6 +8,7 @@ package main
 import (
 	"bytes"
 	"fmt"
+	"go/format"
 	"io/ioutil"
 	"os"
 	"path"
@@ -82,7 +83,13 @@ func generateParamsFiles() {
 			panic(err)
 		}
 
-		res := string(buf.Bytes())
+		// Formating output code
+		code, err := format.Source(buf.Bytes())
+		if err != nil {
+			panic("error formating code")
+		}
+
+		res := string(code)
 		offset := strings.Index(res, TemplateWarning)
 		if offset == -1 {
 			panic("Missing template warning in params.templ.go")
diff --git a/sign/dilithium/gen.go b/sign/dilithium/gen.go
index bd0966852..cb5db3eab 100644
--- a/sign/dilithium/gen.go
+++ b/sign/dilithium/gen.go
@@ -8,6 +8,7 @@ package main
 import (
 	"bytes"
 	"fmt"
+	"go/format"
 	"io/ioutil"
 	"os"
 	"path"
@@ -142,7 +143,13 @@ func generateParamsFiles() {
 			panic(err)
 		}
 
-		res := string(buf.Bytes())
+		// Formating output code
+		code, err := format.Source(buf.Bytes())
+		if err != nil {
+			panic("error formating code")
+		}
+
+		res := string(code)
 		offset := strings.Index(res, TemplateWarning)
 		if offset == -1 {
 			panic("Missing template warning in params.templ.go")