diff --git a/fields/main.go b/fields/main.go
index f0d30b5..cb0b7c1 100644
--- a/fields/main.go
+++ b/fields/main.go
@@ -7,6 +7,7 @@ import (
 	"errors"
 	"flag"
 	"fmt"
+	"go/format"
 	"io"
 	"io/ioutil"
 	"os"
@@ -391,14 +392,20 @@ func main() {
 	}
 
 	// Write version file.
-	versionGo := fmt.Sprintf(`
+	versionGo := []byte(fmt.Sprintf(`
 // Generated code. DO NOT EDIT.
 
 package unifi
 
 const UnifiVersion = %q
-`, unifiVersion)
-	if err := ioutil.WriteFile(filepath.Join(outDir, "version.generated.go"), []byte(versionGo), 0644); err != nil {
+`, unifiVersion))
+
+	versionGo, err = format.Source(versionGo)
+	if err != nil {
+		panic(err)
+	}
+
+	if err := ioutil.WriteFile(filepath.Join(outDir, "version.generated.go"), versionGo, 0644); err != nil {
 		panic(err)
 	}
 
@@ -538,8 +545,16 @@ func (r *Resource) generateCode() (string, error) {
 	}).Parse(apiGoTemplate))
 
 	err = tpl.Execute(writer, r)
+	if err != nil {
+		return "", err
+	}
 
-	return buf.String(), err
+	src, err := format.Source(buf.Bytes())
+	if err != nil {
+		return "", err
+	}
+
+	return string(src), err
 }
 
 func normalizeValidation(re string) string {
diff --git a/unifi/gen.go b/unifi/gen.go
index 38586bc..554570d 100644
--- a/unifi/gen.go
+++ b/unifi/gen.go
@@ -3,4 +3,3 @@ package unifi
 // This will generate the *.generated.go files in this package for the specified
 // Unifi controller version.
 //go:generate go run ../fields/ -version-base-dir=../fields/ -latest
-//go:generate gofmt -w -s ./